New function CRYPTO_num_locks.

diff --git a/CHANGES b/CHANGES
index 8e71a6ab5bcd4d08bc3c6f801b24ffe5a38995d1..b8d187604af381eedbd7852c7a6c8e169ff5d314 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.3a and 0.9.4
 
+  *) New function "CRYPTO_num_locks" that returns CRYPTO_NUM_LOCKS.
+     Whoever hopes to achieve shared-library compatibility across versions
+     must use this, not the compile-time macro.
+     [Bodo Moeller]
+
   *) Add missing case to s3_clnt.c state machine -- one of the new SSL tests
      through a BIO pair triggered the default case, i.e.
      SSLerr(...,SSL_R_UNKNOWN_STATE).

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 78087655aa736951c16635668209a2477f30b04b..d70a570dcee1f72f42943ada2ea6c03989aabd3d 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -133,6 +133,11 @@ int CRYPTO_get_new_lockid(char *name)
        return(i);
        }
 
+int CRYPTO_num_locks(void)
+       {
+       return CRYPTO_NUM_LOCKS;
+       }
+
 void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
                int line)
        {

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 8297b7d0c7b6ac9d0c36bf91f309e09f7fa44cb5..1b927e189da85c0cfc1f144e7f4f0ef86a5ff63d 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -256,6 +256,8 @@ void CRYPTO_new_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad);
 
 int CRYPTO_mem_ctrl(int mode);
 int CRYPTO_get_new_lockid(char *name);
+
+int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */
 void CRYPTO_lock(int mode, int type,const char *file,int line);
 void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
                                              const char *file,int line));