From 6b7887b0ab831ccda7d80516ea84f5d2eebf870b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 18 Mar 2012 18:14:46 +0000 Subject: [PATCH] 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 ------ apps/s_server.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index fe375d0fe3..948e664262 100644 --- 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 a3a04d4734..60c08bec1c 100644 --- 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; -- 2.25.1