From: Kurt Roeckx <kurt@roeckx.be>
Date: Wed, 29 Jun 2016 09:46:39 +0000 (+0200)
Subject: Make CRYPTO_num_locks() return 1
X-Git-Tag: OpenSSL_1_1_0-pre6~294
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=453bff226796f52694f7189c141c33a996458636;p=oweals%2Fopenssl.git

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 <matt@openssl.org>

GH: #1266
---

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)