diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-08 15:44:05 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-08 21:06:04 +0000 |
| commit | 9471f7760dcc81fe6995f016fc7120db0c678818 (patch) | |
| tree | 80e41ab918bfac14a559ecb16efb8e9808569018 /crypto/mem_sec.c | |
| parent | 040d43b3ff8daca32dd0f72155f668249506b51b (diff) | |
Convert mem_dbg and mem_sec to the new Thread API
Use new Thread API style locks, and thread local storage for mem_dbg
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/mem_sec.c')
| -rw-r--r-- | crypto/mem_sec.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 7e41765b30..31c052512d 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c @@ -25,10 +25,9 @@ # include <sys/param.h> # include <sys/stat.h> # include <fcntl.h> +# include "internal/threads.h" #endif -#define LOCK() CRYPTO_w_lock(CRYPTO_LOCK_MALLOC) -#define UNLOCK() CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC) #define CLEAR(p, s) OPENSSL_cleanse(p, s) #ifndef PAGE_SIZE # define PAGE_SIZE 4096 @@ -40,6 +39,8 @@ static size_t secure_mem_used; static int secure_mem_initialized; static int too_late; +static CRYPTO_RWLOCK *sec_malloc_lock = NULL; + /* * These are the functions that must be implemented by a secure heap (sh). */ @@ -58,13 +59,16 @@ int CRYPTO_secure_malloc_init(size_t size, int minsize) if (too_late) return ret; - LOCK(); + OPENSSL_assert(!secure_mem_initialized); if (!secure_mem_initialized) { + sec_malloc_lock = CRYPTO_THREAD_lock_new(); + if (sec_malloc_lock == NULL) + return 0; ret = sh_init(size, minsize); secure_mem_initialized = 1; } - UNLOCK(); + return ret; #else return 0; @@ -74,10 +78,9 @@ int CRYPTO_secure_malloc_init(size_t size, int minsize) void CRYPTO_secure_malloc_done() { #ifdef IMPLEMENTED - LOCK(); sh_done(); secure_mem_initialized = 0; - UNLOCK(); + CRYPTO_THREAD_lock_free(sec_malloc_lock); #endif /* IMPLEMENTED */ } @@ -100,11 +103,11 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line) too_late = 1; return CRYPTO_malloc(num, file, line); } - LOCK(); + CRYPTO_THREAD_write_lock(sec_malloc_lock); ret = sh_malloc(num); actual_size = ret ? sh_actual_size(ret) : 0; secure_mem_used += actual_size; - UNLOCK(); + CRYPTO_THREAD_unlock(sec_malloc_lock); return ret; #else return CRYPTO_malloc(num, file, line); @@ -131,12 +134,12 @@ void CRYPTO_secure_free(void *ptr, const char *file, int line) CRYPTO_free(ptr, file, line); return; } - LOCK(); + CRYPTO_THREAD_write_lock(sec_malloc_lock); actual_size = sh_actual_size(ptr); CLEAR(ptr, actual_size); secure_mem_used -= actual_size; sh_free(ptr); - UNLOCK(); + CRYPTO_THREAD_unlock(sec_malloc_lock); #else CRYPTO_free(ptr, file, line); #endif /* IMPLEMENTED */ @@ -149,9 +152,9 @@ int CRYPTO_secure_allocated(const void *ptr) if (!secure_mem_initialized) return 0; - LOCK(); + CRYPTO_THREAD_write_lock(sec_malloc_lock); ret = sh_allocated(ptr); - UNLOCK(); + CRYPTO_THREAD_unlock(sec_malloc_lock); return ret; #else return 0; @@ -172,9 +175,9 @@ size_t CRYPTO_secure_actual_size(void *ptr) #ifdef IMPLEMENTED size_t actual_size; - LOCK(); + CRYPTO_THREAD_write_lock(sec_malloc_lock); actual_size = sh_actual_size(ptr); - UNLOCK(); + CRYPTO_THREAD_unlock(sec_malloc_lock); return actual_size; #else return 0; |