X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs3_meth.c;h=cdddb17b627d775dc65f6e5f77810d9f36ecf628;hp=387b352370c51faf61b3ce44b321fcc0e24fbe0e;hb=5693a30813a031d3921a016a870420e7eb93ec90;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 387b352370..cdddb17b62 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -57,17 +57,11 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
-static SSL_METHOD *ssl3_get_method(int ver);
-#else
-static SSL_METHOD *ssl3_get_method();
-#endif
-
-static SSL_METHOD *ssl3_get_method(ver)
-int ver;
+static const SSL_METHOD *ssl3_get_method(int ver);
+static const SSL_METHOD *ssl3_get_method(int ver)
 	{
 	if (ver == SSL3_VERSION)
 		return(SSLv3_method());
@@ -75,20 +69,9 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv3_method()
-	{
-	static int init=1;
-	static SSL_METHOD SSLv3_data;
+IMPLEMENT_ssl3_meth_func(SSLv3_method,
+			 ssl3_accept,
+			 ssl3_connect,
+			 ssl3_get_method)
 
-	if (init)
-		{
-		init=0;
-		memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
-			sizeof(SSL_METHOD));
-		SSLv3_data.ssl_connect=ssl3_connect;
-		SSLv3_data.ssl_accept=ssl3_accept;
-		SSLv3_data.get_ssl_method=ssl3_get_method;
-		}
-	return(&SSLv3_data);
-	}