Always use SSLv23_{client,server}_method in s_client.c and s_server.c,
authorDr. Stephen Henson <steve@openssl.org>
Sun, 18 Mar 2012 18:16:46 +0000 (18:16 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 18 Mar 2012 18:16:46 +0000 (18:16 +0000)
the old code came from SSLeay days before TLS was even supported.

apps/s_client.c
apps/s_server.c

index ce199be..6870368 100644 (file)
@@ -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;
index 4603cda..608f320 100644 (file)
@@ -980,17 +980,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;