From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 18 Mar 2012 18:16:05 +0000 (+0000)
Subject: Always use SSLv23_{client,server}_method in s_client.c and s_server.c,
X-Git-Tag: OpenSSL_1_0_1a~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bf4e14cc39c2169bf86853f50284a1e51174e01;p=openssl

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 098cce27dd..fc806eb672 100644
--- 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 fe29b4cae7..3f9b3704c6 100644
--- 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;