X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Fs3_meth.c;h=1fd7a96f87ba23ce91c57d14f428c4fb839f7122;hb=03eeb07152ce9413c017cdef83bd8b5b82bef31d;hp=387b352370c51faf61b3ce44b321fcc0e24fbe0e;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=openssl.git

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 387b352370..1fd7a96f87 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -57,17 +57,11 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static SSL_METHOD *ssl3_get_method(int ver);
-#else
-static SSL_METHOD *ssl3_get_method();
-#endif
-
-static SSL_METHOD *ssl3_get_method(ver)
-int ver;
+static SSL_METHOD *ssl3_get_method(int ver)
 	{
 	if (ver == SSL3_VERSION)
 		return(SSLv3_method());
@@ -75,19 +69,26 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv3_method()
+SSL_METHOD *SSLv3_method(void)
 	{
 	static int init=1;
 	static SSL_METHOD SSLv3_data;
 
 	if (init)
 		{
-		init=0;
-		memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
-			sizeof(SSL_METHOD));
-		SSLv3_data.ssl_connect=ssl3_connect;
-		SSLv3_data.ssl_accept=ssl3_accept;
-		SSLv3_data.get_ssl_method=ssl3_get_method;
+		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
+		
+		if (init)
+			{
+			memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
+				sizeof(SSL_METHOD));
+			SSLv3_data.ssl_connect=ssl3_connect;
+			SSLv3_data.ssl_accept=ssl3_accept;
+			SSLv3_data.get_ssl_method=ssl3_get_method;
+			init=0;
+			}
+
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
 		}
 	return(&SSLv3_data);
 	}