From: Kurt Roeckx <kurt@roeckx.be>
Date: Wed, 29 Jun 2016 09:45:51 +0000 (+0200)
Subject: Add old locking constants back
X-Git-Tag: OpenSSL_1_1_0-pre6~293
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=dd850bcb395753a130a5d69697092d69555b6e2c;hp=453bff226796f52694f7189c141c33a996458636

Add old locking constants back

Fixes #1260

Reviewed-by: Matt Caswell <matt@openssl.org>

GH: #1266
---

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index e9a8d53f4d..acdb48bd61 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -221,6 +221,16 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
 #  define CRYPTO_set_add_lock_callback(func)
 #  define CRYPTO_get_add_lock_callback()        (NULL)
 
+/*
+ * These defines where used in combination with the old locking callbacks,
+ * they are not called anymore, but old code that's not called might still
+ * use them.
+ */
+#  define CRYPTO_LOCK             1
+#  define CRYPTO_UNLOCK           2
+#  define CRYPTO_READ             4
+#  define CRYPTO_WRITE            8
+
 /* This structure is no longer used */
 typedef struct crypto_threadid_st {
     int dummy;