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 fe375d0fe353668640bdb5fb05ba13d947e52e69..948e664262640f16fe5dac92466441e4ccdc35a2 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -440,13 +440,7 @@ int MAIN(int argc, char **argv)
        char *jpake_secret = NULL;
 #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 a3a04d47341d22b6b54da2749aface95d3f77ebe..60c08bec1c919ab0a76e655f4d3001e250addb77 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -872,13 +872,7 @@ int MAIN(int argc, char *argv[])
        /* by default do not send a PSK identity hint */
        static char *psk_identity_hint=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();
-#endif
 
        local_argc=argc;
        local_argv=argv;