X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Ft1_clnt.c;h=9745630a008cf8e1a17e077846afd3650cac109e;hp=1a179221e756908f1a5eae99fdf3f9ef5508378b;hb=e1798f856d00bd5317c6eebda00ef8e51d14b1de;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653 diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c index 1a179221e7..9745630a00 100644 --- a/ssl/t1_clnt.c +++ b/ssl/t1_clnt.c @@ -57,20 +57,14 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" +#include +#include +#include +#include #include "ssl_locl.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(ver) -int ver; +static SSL_METHOD *tls1_get_client_method(int ver) { if (ver == TLS1_VERSION) return(TLSv1_client_method()); @@ -78,18 +72,18 @@ int ver; return(NULL); } -SSL_METHOD *TLSv1_client_method() +SSL_METHOD *TLSv1_client_method(void) { static int init=1; static SSL_METHOD TLSv1_client_data; if (init) { - init=0; 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); }