X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fmem_sec.c;h=be3bb9a62b25da7c6ccea110a7e9d872afda2ede;hp=9adc124e36bd41f1204bd371f3c8b90faa0e6456;hb=05c7b1631b4f6884b9ef5f0943a3d16d36383f52;hpb=d594199bb47362306060db0e185582ffcfd7b6a6 diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9adc124e36..be3bb9a62b 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c @@ -13,10 +13,11 @@ #include #include +#include + #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) # define IMPLEMENTED # include -# include # include # include # include @@ -110,7 +111,16 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line) #endif /* IMPLEMENTED */ } -void CRYPTO_secure_free(void *ptr) +void *CRYPTO_secure_zalloc(size_t num, const char *file, int line) +{ + void *ret = CRYPTO_secure_malloc(num, file, line); + + if (ret != NULL) + memset(ret, 0, num); + return ret; +} + +void CRYPTO_secure_free(void *ptr, const char *file, int line) { #ifdef IMPLEMENTED size_t actual_size; @@ -118,7 +128,7 @@ void CRYPTO_secure_free(void *ptr) if (ptr == NULL) return; if (!secure_mem_initialized) { - CRYPTO_free(ptr); + CRYPTO_free(ptr, file, line); return; } LOCK();