X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs23_meth.c;h=a2b4b224b16435e1a55b77f75dbdb26e79c72607;hb=20d171377f3dbe54d298aa0d0d267ac77f28ce5c;hp=bbda4ff1820b924e73e201af4b3fb87781de8ddb;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=oweals%2Fopenssl.git

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index bbda4ff182..a2b4b224b1 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -57,42 +57,34 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
-static SSL_METHOD *ssl23_get_method(int ver);
-#else
-static SSL_METHOD *ssl23_get_method();
-#endif
-
-static SSL_METHOD *ssl23_get_method(ver)
-int ver;
+static const SSL_METHOD *ssl23_get_method(int ver);
+static const SSL_METHOD *ssl23_get_method(int ver)
 	{
+#ifndef OPENSSL_NO_SSL2
 	if (ver == SSL2_VERSION)
-		return(SSLv23_method());
-	else if (ver == SSL3_VERSION)
+		return(SSLv2_method());
+	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 if (ver == TLS1_1_VERSION)
+		return(TLSv1_1_method());
 	else
+#endif
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv23_method()
-	{
-	static int init=1;
-	static SSL_METHOD SSLv23_data;
-
-	if (init)
-		{
-		init=0;
-		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;
-		}
-	return(&SSLv23_data);
-	}
+IMPLEMENT_ssl23_meth_func(SSLv23_method,
+			ssl23_accept,
+			ssl23_connect,
+			ssl23_get_method)