summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2014-04-19 12:51:20 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2014-04-19 12:55:12 +0200
commit4932e4acb6e0d7aae9bf9c0bce6d69fe041ac62c (patch)
tree77fb1f14620f18d50091f434a95989de09c43474
parentdf7584e7442bb7dbf1035d85e7967f4eef7a22c5 (diff)
downloadgnutls-4932e4acb6e0d7aae9bf9c0bce6d69fe041ac62c.tar.gz
revived gnutls_secure_malloc() to avoid breaking ABI.
gnutls_secure_calloc() is no longer exported as it was never in any public header.
-rw-r--r--lib/gnutls_mem.c1
-rw-r--r--lib/libgnutls.map1
-rw-r--r--symbols.last1
3 files changed, 1 insertions, 2 deletions
diff --git a/lib/gnutls_mem.c b/lib/gnutls_mem.c
index e3b64fe93a..8c24420770 100644
--- a/lib/gnutls_mem.c
+++ b/lib/gnutls_mem.c
@@ -25,6 +25,7 @@
#include <gnutls_num.h>
#include <xsize.h>
+gnutls_alloc_function gnutls_secure_malloc = malloc;
gnutls_alloc_function gnutls_malloc = malloc;
gnutls_free_function gnutls_free = free;
gnutls_realloc_function gnutls_realloc = realloc;
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 921b12d01a..50531a6533 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -303,7 +303,6 @@ GNUTLS_1_4
gnutls_rsa_params_import_pkcs1;
gnutls_rsa_params_import_raw;
gnutls_rsa_params_init;
- gnutls_secure_calloc;
gnutls_secure_malloc;
gnutls_server_name_get;
gnutls_server_name_set;
diff --git a/symbols.last b/symbols.last
index ed29169109..4645613e9b 100644
--- a/symbols.last
+++ b/symbols.last
@@ -596,7 +596,6 @@ gnutls_safe_renegotiation_status@GNUTLS_2_10
gnutls_sec_param_get_name@GNUTLS_2_12
gnutls_sec_param_to_pk_bits@GNUTLS_2_12
gnutls_sec_param_to_symmetric_bits@GNUTLS_3_1_0
-gnutls_secure_calloc@GNUTLS_1_4
gnutls_secure_malloc@GNUTLS_1_4
gnutls_server_name_get@GNUTLS_1_4
gnutls_server_name_set@GNUTLS_1_4