X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_meth.c;h=6ce7c0bbf5856f6bcf0fd56a9c2dbeafded4f0cc;hb=6635b48cd15942a4ae5b43e638eff1db2b41122b;hp=fb065d2c94cc5a47fd4c421ec14d553a8041bd74;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c
index fb065d2c94..6ce7c0bbf5 100644
--- a/ssl/t1_meth.c
+++ b/ssl/t1_meth.c
@@ -57,16 +57,11 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
-static SSL_METHOD *tls1_get_method(int ver);
-#else
-static SSL_METHOD *tls1_get_method();
-#endif
-
-static SSL_METHOD *tls1_get_method(int ver)
+static const SSL_METHOD *tls1_get_method(int ver);
+static const SSL_METHOD *tls1_get_method(int ver)
 	{
 	if (ver == TLS1_VERSION)
 		return(TLSv1_method());
@@ -74,20 +69,8 @@ static SSL_METHOD *tls1_get_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *TLSv1_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD TLSv1_data;
-
-	if (init)
-		{
-		init=0;
-		memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(),
-			sizeof(SSL_METHOD));
-		TLSv1_data.ssl_connect=ssl3_connect;
-		TLSv1_data.ssl_accept=ssl3_accept;
-		TLSv1_data.get_ssl_method=tls1_get_method;
-		}
-	return(&TLSv1_data);
-	}
+IMPLEMENT_tls1_meth_func(TLSv1_method,
+			ssl3_accept,
+			ssl3_connect,
+			tls1_get_method)