From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 18 Mar 2012 18:16:46 +0000 (+0000)
Subject: Always use SSLv23_{client,server}_method in s_client.c and s_server.c,
X-Git-Tag: master-pre-reformat~1846
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbbe61c95872f094a46fc81942c8f6fba1846de9;p=thirdparty%2Fopenssl.git

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 ce199be81bb..6870368ff1f 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 4603cdafcd1..608f3208dcc 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -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;