X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs23_meth.c;h=f207140835f8680741db3e4ad3de83f69b1b0712;hb=86a249fe4ffca828926f60989b6fbffff507a439;hp=bbda4ff1820b924e73e201af4b3fb87781de8ddb;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=oweals%2Fopenssl.git

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index bbda4ff182..f207140835 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -57,20 +57,14 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static SSL_METHOD *ssl23_get_method(int ver);
-#else
-static SSL_METHOD *ssl23_get_method();
-#endif
-
-static SSL_METHOD *ssl23_get_method(ver)
-int ver;
+static SSL_METHOD *ssl23_get_method(int ver)
 	{
 	if (ver == SSL2_VERSION)
-		return(SSLv23_method());
+		return(SSLv2_method());
 	else if (ver == SSL3_VERSION)
 		return(SSLv3_method());
 	else if (ver == TLS1_VERSION)
@@ -79,19 +73,26 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv23_method()
+SSL_METHOD *SSLv23_method(void)
 	{
 	static int init=1;
 	static SSL_METHOD SSLv23_data;
 
 	if (init)
 		{
-		init=0;
-		memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
-			sizeof(SSL_METHOD));
-		SSLv23_data.ssl_connect=ssl23_connect;
-		SSLv23_data.ssl_accept=ssl23_accept;
-		SSLv23_data.get_ssl_method=ssl23_get_method;
+		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
+		
+		if (init)
+			{
+			memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
+				sizeof(SSL_METHOD));
+			SSLv23_data.ssl_connect=ssl23_connect;
+			SSLv23_data.ssl_accept=ssl23_accept;
+			SSLv23_data.get_ssl_method=ssl23_get_method;
+			init=0;
+			}
+		
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
 		}
 	return(&SSLv23_data);
 	}