From d18ae25f28e72831dc3c51f78e0735342540098b Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sat, 17 Mar 2018 16:20:01 +0000
Subject: Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions.  The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@
---
 src/lib/libcrypto/engine/eng_lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/engine/eng_lib.c')

diff --git a/src/lib/libcrypto/engine/eng_lib.c b/src/lib/libcrypto/engine/eng_lib.c
index d2da29fe69..11ad771109 100644
--- a/src/lib/libcrypto/engine/eng_lib.c
+++ b/src/lib/libcrypto/engine/eng_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_lib.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: eng_lib.c,v 1.13 2018/03/17 16:20:01 beck Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -70,6 +70,9 @@ ENGINE_new(void)
 {
 	ENGINE *ret;
 
+	if (!OPENSSL_init_crypto(0, NULL))
+		return NULL;
+
 	ret = malloc(sizeof(ENGINE));
 	if (ret == NULL) {
 		ENGINEerror(ERR_R_MALLOC_FAILURE);
-- 
cgit v1.2.3-55-g6feb