X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Fs2_meth.c;h=e2add164ddbee56fcded632f368dc1cc41edc850;hb=d3407350d87791ab4fa369d2b5a58f27d9680fd0;hp=f28c9162cff4357943d63064e2fa226cb455234e;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=openssl.git

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index f28c9162cf..e2add164dd 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,18 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_RSA
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static SSL_METHOD *ssl2_get_method(int ver);
-#else
-static SSL_METHOD *ssl2_get_method();
-#endif
-
-static SSL_METHOD *ssl2_get_method(ver)
-int ver;
+static SSL_METHOD *ssl2_get_method(int ver)
 	{
 	if (ver == SSL2_VERSION)
 		return(SSLv2_method());
@@ -75,20 +70,20 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv2_method()
+SSL_METHOD *SSLv2_method(void)
 	{
 	static int init=1;
 	static SSL_METHOD SSLv2_data;
 
 	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;
+		init=0;
 		}
 	return(&SSLv2_data);
 	}
-
+#endif