X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs2_meth.c;h=a35e435b71379c3d61b89deccf12232df862e1e4;hb=cadbbd51c8b4e66515cd3e97754cfeda606c7b15;hp=54ff252d9ad372ef8a7dbb302769daecfd9c7ab0;hpb=752d706aaf651ce87368bc826a3035a6a4f31190;p=oweals%2Fopenssl.git

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index 54ff252d9a..a35e435b71 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,10 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_RSA
+#include "ssl_locl.h"
+#ifndef OPENSSL_NO_SSL2
 #include <stdio.h>
 #include <openssl/objects.h>
-#include "ssl_locl.h"
 
 static SSL_METHOD *ssl2_get_method(int ver);
 static SSL_METHOD *ssl2_get_method(int ver)
@@ -70,23 +70,12 @@ static SSL_METHOD *ssl2_get_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv2_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD SSLv2_data;
+IMPLEMENT_ssl2_meth_func(SSLv2_method,
+			ssl2_accept,
+			ssl2_connect,
+			ssl2_get_method)
 
-	if (init)
-		{
-		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);
-	}
-#else /* !NO_RSA */
+#else /* !OPENSSL_NO_SSL2 */
 
 # if PEDANTIC
 static void *dummy=&dummy;