X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_clnt.c;h=4d1e198cdcde1ec6c04eb47e9a76d9b11d567d93;hb=4a052f0bb94e5e6932b8c09102279ed2e79eaad2;hp=429ad0eca5d9ee661f62e854cdbfd042313c701f;hpb=5cc146f344bd2225e7afa66052a8401468b94ef4;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index 429ad0eca5..4d1e198cdc 100644
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -57,18 +57,13 @@
  */
 
 #include <stdio.h>
-#include "buffer.h"
-#include "rand.h"
-#include "objects.h"
-#include "evp.h"
 #include "ssl_locl.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
 
-#ifndef NOPROTO
 static SSL_METHOD *tls1_get_client_method(int ver);
-#else
-static SSL_METHOD *tls1_get_client_method();
-#endif
-
 static SSL_METHOD *tls1_get_client_method(int ver)
 	{
 	if (ver == TLS1_VERSION)
@@ -77,19 +72,8 @@ static SSL_METHOD *tls1_get_client_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *TLSv1_client_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD TLSv1_client_data;
-
-	if (init)
-		{
-		memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(),
-			sizeof(SSL_METHOD));
-		TLSv1_client_data.ssl_connect=ssl3_connect;
-		TLSv1_client_data.get_ssl_method=tls1_get_client_method;
-		init=0;
-		}
-	return(&TLSv1_client_data);
-	}
+IMPLEMENT_tls1_meth_func(TLSv1_client_method,
+			ssl_undefined_function,
+			ssl3_connect,
+			tls1_get_client_method)