From 86a4f59ffae40cb4fbd9276304debb72b6924496 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 13 Feb 2016 10:38:51 -0500 Subject: [PATCH] Remove references to gnutls_global_set_mem_functions(). --- doc/libpwmd.3 | 15 +++------------ src/libpwmd.h.in | 21 --------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/doc/libpwmd.3 b/doc/libpwmd.3 index c106d9e5..4c1d2c3d 100644 --- a/doc/libpwmd.3 +++ b/doc/libpwmd.3 @@ -1,4 +1,4 @@ -.TH "libpwmd.h" 3 "Tue Oct 20 2015" "Version 7.3.0" "libpwmd" \" -*- nroff -*- +.TH "libpwmd.h" 3 "Sat Feb 13 2016" "Version 7.3.0" "libpwmd" \" -*- nroff -*- .ad l .nh .SH NAME @@ -91,7 +91,7 @@ libgpg-error returns an error code as a bitmask of an error source and the error .RI "#define \fBLIBPWMD_VERSION_PATCH\fP 0" .br .ti -1c -.RI "#define \fBLIBPWMD_VERSION_STR\fP '7\&.3\&.0-dev'" +.RI "#define \fBLIBPWMD_VERSION_STR\fP '7\&.3\&.0\-dev'" .br .ti -1c .RI "#define \fBPWMD_FEATURE_PINENTRY\fP" @@ -228,9 +228,6 @@ libgpg-error returns an error code as a bitmask of an error source and the error .ti -1c .RI "LIBPWMD_API char * \fBpwmd_strdup_printf\fP (const char *fmt,\&.\&.\&.)" .br -.ti -1c -.RI "void \fBgnutls_global_set_mem_functions\fP (void *(*)(size_t), void *(*)(size_t), int(*)(const void *), void *(*)(void *, size_t), void(*)(void *))" -.br .in -1c .SH "Constant Details" .PP @@ -250,7 +247,7 @@ Version information\&. The minor release number of this library\&. .PP Version information\&. The patch level of this library\&. -.SS "#define LIBPWMD_VERSION_STR '7\&.3\&.0-dev'" +.SS "#define LIBPWMD_VERSION_STR '7\&.3\&.0\-dev'" .PP Version information\&. A string representation of the version of this library\&. @@ -611,12 +608,6 @@ An SSH channel over a TCP socket\&. A TLS connection over a TCP socket\&. .SH "Function Details" .PP -.SS "void gnutls_global_set_mem_functions (void **)(size_t, void **)(size_t, int(*)(const void *), void **)(void *, size_t, void(*)(void *))" - -.PP -Convenience declaration\&. This allows an application wanting both a TLS connection and libpwmd secure memory management in GnuTLS, not needing to have the GnuTLS development files installed\&. This function should be called before \fBpwmd_init()\fP\&. -.PP -It is not done in \fBpwmd_init()\fP itself since the application may have already initialized GnuTLS by some other means\&. .SS "LIBPWMD_API void* pwmd_calloc (size_t nmemb, size_t size)" .PP diff --git a/src/libpwmd.h.in b/src/libpwmd.h.in index 4d030e52..33803db5 100644 --- a/src/libpwmd.h.in +++ b/src/libpwmd.h.in @@ -991,27 +991,6 @@ LIBPWMD_API char *pwmd_strdup (const char *str); */ LIBPWMD_API char *pwmd_strdup_printf (const char *fmt, ...); -/*! \brief Convenience declaration. - * - * This allows an application wanting both a TLS connection and libpwmd secure - * memory management in GnuTLS, not needing to have the GnuTLS development - * files installed. This function should be called before \ref pwmd_init(). - * - * It is not done in \ref pwmd_init() itself since the application may have - * already initialized GnuTLS by some other means. - */ -extern void gnutls_global_set_mem_functions ( - // gnutls_alloc_function - void *(*)(size_t), - // gnutls_alloc_function (secure) - void *(*)(size_t), - // gnutls_is_secure_function - int (*)(const void *), - // gnutls_realloc_function - void *(*)(void *, size_t), - // gnutls_free_function - void (*)(void *)); - #ifdef __cplusplus } #endif -- 2.11.4.GIT