X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs23_meth.c;h=950d9aab3d9e4be1207bb3daf3610dc0bca9e8c1;hb=7f065cfdbd6f18a81a3f54ba6b8d5045fb533c89;hp=f207140835f8680741db3e4ad3de83f69b1b0712;hpb=b0c0f200712ea51b6442fa0d496a6e0088017890;p=oweals%2Fopenssl.git

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index f207140835..950d9aab3d 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -63,37 +63,26 @@
 static SSL_METHOD *ssl23_get_method(int ver);
 static SSL_METHOD *ssl23_get_method(int ver)
 	{
+#ifndef OPENSSL_NO_SSL2
 	if (ver == SSL2_VERSION)
 		return(SSLv2_method());
-	else if (ver == SSL3_VERSION)
+	else
+#endif
+#ifndef OPENSSL_NO_SSL3
+	if (ver == SSL3_VERSION)
 		return(SSLv3_method());
-	else if (ver == TLS1_VERSION)
+	else
+#endif
+#ifndef OPENSSL_NO_TLS1
+	if (ver == TLS1_VERSION)
 		return(TLSv1_method());
 	else
+#endif
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv23_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD SSLv23_data;
-
-	if (init)
-		{
-		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);
-	}
+IMPLEMENT_ssl23_meth_func(SSLv23_method,
+			ssl23_accept,
+			ssl23_connect,
+			ssl23_get_method)