From 929f11673384d9f518b47bd4dc7f1878e80cdf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Thu, 26 Sep 2002 15:52:34 +0000
Subject: fix more race conditions

Submitted by: "Patrick McCormick" <patrick@tellme.com>
PR: 262
---
 ssl/s23_meth.c | 19 +++++++++++++------
 ssl/s2_meth.c  | 19 +++++++++++++------
 ssl/s3_meth.c  | 19 +++++++++++++------
 ssl/t1_meth.c  | 20 ++++++++++++++------
 4 files changed, 53 insertions(+), 24 deletions(-)

(limited to 'ssl')

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index 40684311db..f207140835 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -80,12 +80,19 @@ SSL_METHOD *SSLv23_method(void)
 
 	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_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);
 	}
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index d30b7179f7..8b6cbd086e 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -77,12 +77,19 @@ SSL_METHOD *SSLv2_method(void)
 
 	if (init)
 		{
-		memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
-			sizeof(SSL_METHOD));
-		SSLv2_data.ssl_connect=ssl2_connect;
-		SSLv2_data.ssl_accept=ssl2_accept;
-		SSLv2_data.get_ssl_method=ssl2_get_method;
-		init=0;
+		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
+		
+		if (init)
+			{
+			memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
+				sizeof(SSL_METHOD));
+			SSLv2_data.ssl_connect=ssl2_connect;
+			SSLv2_data.ssl_accept=ssl2_accept;
+			SSLv2_data.get_ssl_method=ssl2_get_method;
+			init=0;
+			}
+		
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
 		}
 	return(&SSLv2_data);
 	}
diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 81bcad89c5..1fd7a96f87 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -76,12 +76,19 @@ SSL_METHOD *SSLv3_method(void)
 
 	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_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);
 	}
diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c
index 9bb36a7d1c..fcc243f782 100644
--- a/ssl/t1_meth.c
+++ b/ssl/t1_meth.c
@@ -76,13 +76,21 @@ SSL_METHOD *TLSv1_method(void)
 
 	if (init)
 		{
-		memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(),
-			sizeof(SSL_METHOD));
-		TLSv1_data.ssl_connect=ssl3_connect;
-		TLSv1_data.ssl_accept=ssl3_accept;
-		TLSv1_data.get_ssl_method=tls1_get_method;
-		init=0;
+		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
+		
+		if (init)
+			{
+			memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(),
+				sizeof(SSL_METHOD));
+			TLSv1_data.ssl_connect=ssl3_connect;
+			TLSv1_data.ssl_accept=ssl3_accept;
+			TLSv1_data.get_ssl_method=tls1_get_method;
+			init=0;
+			}
+
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
 		}
+	
 	return(&TLSv1_data);
 	}
 
-- 
cgit v1.2.3