X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ssl%2Fs23_meth.c;h=c88569d32ceb9fa16912c8f28ac18c6a314afd25;hb=3152861e8137da9bc95b8b173c33c2446a02a5eb;hp=bbda4ff1820b924e73e201af4b3fb87781de8ddb;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=openssl.git

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index bbda4ff182..c88569d32c 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -57,20 +57,14 @@
  */
 
 #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 SSL_METHOD *ssl23_get_method(int ver)
 	{
 	if (ver == SSL2_VERSION)
-		return(SSLv23_method());
+		return(SSLv2_method());
 	else if (ver == SSL3_VERSION)
 		return(SSLv3_method());
 	else if (ver == TLS1_VERSION)
@@ -79,20 +73,8 @@ int ver;
 		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)