X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_meth.c;h=53c807de28097b0a008ddb8bd689fac179d0a94f;hb=48e0f6667b86cade6e7b7afa83c7006ab7e8c2d1;hp=888ea3e6a8e7a878ba5fb93cbcde54b2668548ca;hpb=5cc146f344bd2225e7afa66052a8401468b94ef4;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c
index 888ea3e6a8..53c807de28 100644
--- a/ssl/t1_meth.c
+++ b/ssl/t1_meth.c
@@ -57,37 +57,32 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
-static SSL_METHOD *tls1_get_method(int ver);
-#else
-static SSL_METHOD *tls1_get_method();
-#endif
-
-static SSL_METHOD *tls1_get_method(int ver)
+static const SSL_METHOD *tls1_get_method(int ver)
 	{
+	if (ver == TLS1_2_VERSION)
+		return TLSv1_2_method();
+	if (ver == TLS1_1_VERSION)
+		return TLSv1_1_method();
 	if (ver == TLS1_VERSION)
-		return(TLSv1_method());
-	else
-		return(NULL);
+		return TLSv1_method();
+	return NULL;
 	}
 
-SSL_METHOD *TLSv1_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD TLSv1_data;
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,
+			ssl3_accept,
+			ssl3_connect,
+			tls1_get_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;
-		}
-	return(&TLSv1_data);
-	}
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,
+			ssl3_accept,
+			ssl3_connect,
+			tls1_get_method)
+
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,
+			ssl3_accept,
+			ssl3_connect,
+			tls1_get_method)