2 files changed, 38 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
index 8ab93fece8..87657eded3 100644
--- a/src/lib/libcrypto/evp/c_all.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_all.c,v 1.21 2017/03/01 13:53:58 jsing Exp $ */
+/* $OpenBSD: c_all.c,v 1.22 2018/03/17 16:20:01 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <pthread.h>
 
 #include <openssl/opensslconf.h>
 
@@ -66,8 +67,8 @@
 
 #include "cryptlib.h"
 
-void
-OpenSSL_add_all_ciphers(void)
+static void
+OpenSSL_add_all_ciphers_internal(void)
 {
 #ifndef OPENSSL_NO_DES
         EVP_add_cipher(EVP_des_cfb());
@@ -226,7 +227,14 @@ OpenSSL_add_all_ciphers(void)
 }
 
 void
-OpenSSL_add_all_digests(void)
+OpenSSL_add_all_ciphers(void)
+{
+        static pthread_once_t add_all_ciphers_once = PTHREAD_ONCE_INIT;
+        (void) pthread_once(&add_all_ciphers_once, OpenSSL_add_all_ciphers_internal);
+}
+
+static void
+OpenSSL_add_all_digests_internal(void)
 {
 #ifndef OPENSSL_NO_MD4
         EVP_add_digest(EVP_md4());
@@ -284,6 +292,13 @@ OpenSSL_add_all_digests(void)
 }
 
 void
+OpenSSL_add_all_digests(void)
+{
+        static pthread_once_t add_all_digests_once = PTHREAD_ONCE_INIT;
+        (void) pthread_once(&add_all_digests_once, OpenSSL_add_all_digests_internal);
+}
+
+void
 OPENSSL_add_all_algorithms_noconf(void)
 {
         OPENSSL_cpuid_setup();
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c
index ebaa3a2f6f..dfcf9ee225 100644
--- a/src/lib/libcrypto/evp/names.c
+++ b/src/lib/libcrypto/evp/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.13 2017/04/29 21:48:44 jsing Exp $ */
+/* $OpenBSD: names.c,v 1.14 2018/03/17 16:20:01 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -113,6 +113,9 @@ EVP_get_cipherbyname(const char *name)
 {
         const EVP_CIPHER *cp;
 
+        if (!OPENSSL_init_crypto(0, NULL))
+                return NULL;
+
         cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH);
         return (cp);
 }
@@ -122,6 +125,9 @@ EVP_get_digestbyname(const char *name)
 {
         const EVP_MD *cp;
 
+        if (!OPENSSL_init_crypto(0, NULL))
+                return NULL;
+
         cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH);
         return (cp);
 }
@@ -167,6 +173,9 @@ EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, const char *from,
 {
         struct doall_cipher dc;
 
+        /* Prayer and clean living lets you ignore errors, OpenSSL style */
+        (void) OPENSSL_init_crypto(0, NULL);
+
         dc.fn = fn;
         dc.arg = arg;
         OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
@@ -178,6 +187,9 @@ EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from,
 {
         struct doall_cipher dc;
 
+        /* Prayer and clean living lets you ignore errors, OpenSSL style */
+        (void) OPENSSL_init_crypto(0, NULL);
+
         dc.fn = fn;
         dc.arg = arg;
         OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
@@ -207,6 +219,9 @@ EVP_MD_do_all(void (*fn)(const EVP_MD *md, const char *from, const char *to,
 {
         struct doall_md dc;
 
+        /* Prayer and clean living lets you ignore errors, OpenSSL style */
+        (void) OPENSSL_init_crypto(0, NULL);
+
         dc.fn = fn;
         dc.arg = arg;
         OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
@@ -218,6 +233,9 @@ EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
 {
         struct doall_md dc;
 
+        /* Prayer and clean living lets you ignore errors, OpenSSL style */
+        (void) OPENSSL_init_crypto(0, NULL);
+
         dc.fn = fn;
         dc.arg = arg;
         OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);