X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs3_meth.c;h=6a6eb1c58f80cbb8e1b9fda9ff8ad35c201047ba;hb=0b8cd5acd6616888a3cde85d6127c93894dfe797;hp=d9cd9c2210130020ddd7f3ebd71ab4ec71e208f7;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=oweals%2Fopenssl.git

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index d9cd9c2210..6a6eb1c58f 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -57,15 +57,10 @@
  */
 
 #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(int ver)
 	{
 	if (ver == SSL3_VERSION)
@@ -74,20 +69,9 @@ static SSL_METHOD *ssl3_get_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *SSLv3_method(void)
-	{
-	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);
-	}