X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Ft1_clnt.c;h=c87af17712f49ffd6ac815c85c8323c409c79669;hb=762a2e3cab62bb184104f3f8349a0cd609594dae;hp=9745630a008cf8e1a17e077846afd3650cac109e;hpb=a9be3af5ad4836f7e50f0546311ca90c717b861e;p=openssl.git

diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index 9745630a00..c87af17712 100644
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -57,14 +57,14 @@
  */
 
 #include <stdio.h>
+#include "ssl_locl.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "ssl_locl.h"
 
-static SSL_METHOD *tls1_get_client_method(int ver);
-static SSL_METHOD *tls1_get_client_method(int ver)
+static const SSL_METHOD *tls1_get_client_method(int ver);
+static const SSL_METHOD *tls1_get_client_method(int ver)
 	{
 	if (ver == TLS1_VERSION)
 		return(TLSv1_client_method());
@@ -72,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)