summaryrefslogtreecommitdiffstats
path: root/include/openssl/crypto.h
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2016-06-29 11:45:51 +0200
committerKurt Roeckx <kurt@roeckx.be>2016-07-01 17:02:33 +0200
commitdd850bcb395753a130a5d69697092d69555b6e2c (patch)
tree764a0fa0e1d6be338efda2e46d2780657cec8a1f /include/openssl/crypto.h
parent453bff226796f52694f7189c141c33a996458636 (diff)
Add old locking constants back
Fixes #1260 Reviewed-by: Matt Caswell <matt@openssl.org> GH: #1266
Diffstat (limited to 'include/openssl/crypto.h')
-rw-r--r--include/openssl/crypto.h10
1 files changed, 10 insertions, 0 deletions
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;