From 453bff226796f52694f7189c141c33a996458636 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Wed, 29 Jun 2016 11:46:39 +0200 Subject: [PATCH] Make CRYPTO_num_locks() return 1 malloc(0) might return NULL and code for the old callbacks might fail, instead just say they should allocate 1 entry. Reviewed-by: Matt Caswell GH: #1266 --- include/openssl/crypto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 2e056c5bce..e9a8d53f4d 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -215,7 +215,7 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx); * On the other hand, the locking callbacks are no longer used. Consequently, * the callback management functions can be safely replaced with no-op macros. */ -# define CRYPTO_num_locks() (0) +# define CRYPTO_num_locks() (1) # define CRYPTO_set_locking_callback(func) # define CRYPTO_get_locking_callback() (NULL) # define CRYPTO_set_add_lock_callback(func) -- 2.25.1