diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2012-03-18 18:16:46 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2012-03-18 18:16:46 +0000 |
commit | bbbe61c95872f094a46fc81942c8f6fba1846de9 (patch) | |
tree | 8a5c31751448746ef412758cc3d6ac6d73a56f3c /apps | |
parent | df27a3513753ece98b0dc52d5a9055727e13d10c (diff) | |
download | openssl-bbbe61c95872f094a46fc81942c8f6fba1846de9.tar.gz |
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.
Diffstat (limited to 'apps')
-rw-r--r-- | apps/s_client.c | 6 | ||||
-rw-r--r-- | apps/s_server.c | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index ce199be81b..6870368ff1 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 4603cdafcd..608f3208dc 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; |