From a9101cdcaa77ef4a7301b7a90aee32459257f02b Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 18 Mar 2012 18:18:30 +0000
Subject: 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.

---
 apps/s_client.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'apps/s_client.c')

diff --git a/apps/s_client.c b/apps/s_client.c
index 2f743f0a0a..54a32ece6b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -345,13 +345,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;
-- 
cgit v1.2.3