Correct lock initialisation for libcrypto.

The current crypto_lock_init() function is not called early enough, meaning
that locks are already in use before it gets called. Worse, locks could be
in use when they are then initialised. Furthermore, since functions like
CRYPTO_lock() are public API, these could be called directly bypassing
initialisation.

Avoid these issues by using static initialisers.

ok bcook@

1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c
index 3745e2e718..67e7920890 100644
--- a/src/lib/libcrypto/crypto_init.c
+++ b/src/lib/libcrypto/crypto_init.c
@@ -23,6 +23,7 @@
 #include <openssl/conf.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
+
 #include "cryptlib.h"
 
 int OpenSSL_config(const char *);
@@ -30,17 +31,15 @@ int OpenSSL_no_config(void);
 
 static pthread_t crypto_init_thread;
 
-void crypto_init_locks(void);
-
 static void
 OPENSSL_init_crypto_internal(void)
 {
         crypto_init_thread = pthread_self();
+
         OPENSSL_cpuid_setup();
         ERR_load_crypto_strings();
         OpenSSL_add_all_ciphers();
         OpenSSL_add_all_digests();
-        crypto_init_locks();
 }
 
 int