X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs23_meth.c;h=b52ca1d58b3f2763c51bd1cb12ba1109487c7482;hp=bbda4ff1820b924e73e201af4b3fb87781de8ddb;hb=bb28bcdf987ed9a5599de7e14be6c1e900dad4d3;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653 diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c index bbda4ff182..b52ca1d58b 100644 --- a/ssl/s23_meth.c +++ b/ssl/s23_meth.c @@ -57,17 +57,11 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" -#ifndef NOPROTO static SSL_METHOD *ssl23_get_method(int ver); -#else -static SSL_METHOD *ssl23_get_method(); -#endif - -static SSL_METHOD *ssl23_get_method(ver) -int ver; +static SSL_METHOD *ssl23_get_method(int ver) { if (ver == SSL2_VERSION) return(SSLv23_method()); @@ -79,19 +73,19 @@ int ver; return(NULL); } -SSL_METHOD *SSLv23_method() +SSL_METHOD *SSLv23_method(void) { static int init=1; static SSL_METHOD SSLv23_data; if (init) { - init=0; memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(), sizeof(SSL_METHOD)); SSLv23_data.ssl_connect=ssl23_connect; SSLv23_data.ssl_accept=ssl23_accept; SSLv23_data.get_ssl_method=ssl23_get_method; + init=0; } return(&SSLv23_data); }