aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2017-07-28 21:24:02 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2017-07-29 19:26:06 +0200
commit4dae7cd3f0f074e01b2fe73ffff0dfbf032fa566 (patch)
tree0acb65b271fc6dabdc115b2d4dfe2e8439ac769a /include
parent0443b1171da43696a2cd67cfcb0624be1e3ee25b (diff)
downloadopenssl-4dae7cd3f0f074e01b2fe73ffff0dfbf032fa566.tar.gz
Implement the CRYPTO_secure_clear_free function
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4044)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/crypto.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index f0bc98f320..cebde9734b 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -144,6 +144,8 @@ int CRYPTO_mem_ctrl(int mode);
CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_free(addr) \
CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
+# define OPENSSL_secure_clear_free(addr, num) \
+ CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_actual_size(ptr) \
CRYPTO_secure_actual_size(ptr)
@@ -283,6 +285,8 @@ int CRYPTO_secure_malloc_done(void);
void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
void CRYPTO_secure_free(void *ptr, const char *file, int line);
+void CRYPTO_secure_clear_free(void *ptr, size_t num,
+ const char *file, int line);
int CRYPTO_secure_allocated(const void *ptr);
int CRYPTO_secure_malloc_initialized(void);
size_t CRYPTO_secure_actual_size(void *ptr);