Always use SSLv23_{client,server}_method in s_client.c and s_server.c,

the old code came from SSLeay days before TLS was even supported.

diff --git a/apps/s_client.c b/apps/s_client.c
index 098cce27ddb766052bf1d6250fbba604aee685ee..fc806eb67263bcd6c03cd0c911f6eb9813e0d816 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -622,13 +622,7 @@ int MAIN(int argc, char **argv)
        SRP_ARG srp_arg = {NULL,NULL,0,0,0,1024};
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
-       meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
-       meth=SSLv2_client_method();
-#endif
 
        apps_startup();
        c_Pause=0;

diff --git a/apps/s_server.c b/apps/s_server.c
index fe29b4cae7acf2a026bde310166aaff355825056..3f9b3704c62a3052a81cd61540c1d8c670fbbb92 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -969,17 +969,7 @@ int MAIN(int argc, char *argv[])
        char *srpuserseed = NULL;
        char *srp_verifier_file = NULL;
 #endif
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-       meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-       meth=SSLv2_server_method();
-#elif !defined(OPENSSL_NO_TLS1)
-       meth=TLSv1_server_method();
-#else
-  /*  #error no SSL version enabled */
-#endif
 
        local_argc=argc;
        local_argv=argv;