From: beck <beck@openbsd.org>
Date: Sat, 29 Apr 2017 22:31:42 +0000 (+0000)
Subject: Revert previous - we still want to do this, but I forgot about the installer
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cb6231d9534ff0badffba5f22a8b3abb18dbf1db;p=openbsd

Revert previous - we still want to do this, but I forgot about the installer
and want to avoid the wrath of theo when he arrives home in a couple
of hours :)
---

diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index 7656e88cea8..12a4b4c2fad 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/04/29 22:22:24 beck Exp $
+# $OpenBSD: Makefile,v 1.34 2017/04/29 22:31:42 beck Exp $
 
 .include <bsd.own.mk>
 .ifndef NOMAN
@@ -19,7 +19,6 @@ CFLAGS+= -DLIBRESSL_INTERNAL
 CFLAGS+= -I${.CURDIR}
 
 LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto
-LDADD+= -L${BSDOBJDIR}/lib/libpthread -lpthread
 
 VERSION_SCRIPT=	Symbols.map
 SYMBOL_LIST=	${.CURDIR}/Symbols.list
diff --git a/lib/libssl/ssl_algs.c b/lib/libssl/ssl_algs.c
index ab88b29cc16..ca84891e72e 100644
--- a/lib/libssl/ssl_algs.c
+++ b/lib/libssl/ssl_algs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_algs.c,v 1.25 2017/04/29 21:54:54 beck Exp $ */
+/* $OpenBSD: ssl_algs.c,v 1.26 2017/04/29 22:31:42 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,15 +60,13 @@
 
 #include <openssl/lhash.h>
 #include <openssl/objects.h>
-#include <pthread.h>
 
 #include "ssl_locl.h"
 
-pthread_once_t SSL_library_init_once = PTHREAD_ONCE_INIT;
-
-static void
-SSL_library_init_internal(void)
+int
+SSL_library_init(void)
 {
+
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cbc());
 	EVP_add_cipher(EVP_des_ede3_cbc());
@@ -127,11 +125,6 @@ SSL_library_init_internal(void)
 #endif
 	/* initialize cipher/digest methods table */
 	ssl_load_ciphers();
+	return (1);
 }
 
-int
-SSL_library_init(void)
-{
-	pthread_once(&SSL_library_init_once, SSL_library_init_internal);
-	return 1;
-}