X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs2_meth.c;h=f0e8ca593d408c9a8f5ba82e4bd2d8ed65229f39;hp=cfc8828cc7185e85cee6d71c87cc36558393d5e1;hb=77a926e6769705944e8ac8db37650cd36161be97;hpb=58964a492275ca9a59a0cd9c8155cb2491b4b909

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index cfc8828cc7..f0e8ca593d 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,12 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include "objects.h"
 #include "ssl_locl.h"
+#ifndef OPENSSL_NO_SSL2
+#include <stdio.h>
+#include <openssl/objects.h>
 
-static SSL_METHOD *ssl2_get_method(ver)
-int ver;
+static const SSL_METHOD *ssl2_get_method(int ver);
+static const SSL_METHOD *ssl2_get_method(int ver)
 	{
 	if (ver == SSL2_VERSION)
 		return(SSLv2_method());
@@ -69,20 +70,15 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv2_method()
-	{
-	static int init=1;
-	static SSL_METHOD SSLv2_data;
+IMPLEMENT_ssl2_meth_func(SSLv2_method,
+			 ssl2_accept,
+			 ssl2_connect,
+			 ssl2_get_method)
 
-	if (init)
-		{
-		init=0;
-		memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
-			sizeof(SSL_METHOD));
-		SSLv2_data.ssl_connect=ssl2_connect;
-		SSLv2_data.ssl_accept=ssl2_accept;
-		SSLv2_data.get_ssl_method=ssl2_get_method;
-		}
-	return(&SSLv2_data);
-	}
+#else /* !OPENSSL_NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
 
+#endif