X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_srvr.c;h=42525e9e89ff08f8dd28ff65d1888f6b482352cb;hb=6635b48cd15942a4ae5b43e638eff1db2b41122b;hp=c72e5525ae1c6c997e63f1aea2fb5afb15e95de3;hpb=e78f137899af768e1e9335f080826dc9f18eb882;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index c72e5525ae..42525e9e89 100644
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -64,8 +64,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-static SSL_METHOD *tls1_get_server_method(int ver);
-static SSL_METHOD *tls1_get_server_method(int ver)
+static const SSL_METHOD *tls1_get_server_method(int ver);
+static const SSL_METHOD *tls1_get_server_method(int ver)
 	{
 	if (ver == TLS1_VERSION)
 		return(TLSv1_server_method());
@@ -73,23 +73,8 @@ static SSL_METHOD *tls1_get_server_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *TLSv1_server_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD TLSv1_server_data;
-
-	if (init)
-		{
-		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
-
-		memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
-			sizeof(SSL_METHOD));
-		TLSv1_server_data.ssl_accept=ssl3_accept;
-		TLSv1_server_data.get_ssl_method=tls1_get_server_method;
-		init=0;
-
-		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
-		}
-	return(&TLSv1_server_data);
-	}
+IMPLEMENT_tls1_meth_func(TLSv1_server_method,
+			ssl3_accept,
+			ssl_undefined_function,
+			tls1_get_server_method)