diff options
| author | steve <steve> | 2012-03-18 18:16:46 +0000 |
|---|---|---|
| committer | steve <steve> | 2012-03-18 18:16:46 +0000 |
| commit | a6a466d7b6f6d623a8f6e8b597958a039b32c003 (patch) | |
| tree | 58badc165d081249134aafaa11c21006b859a898 | |
| parent | d522a66b5e9c6606b712028db44e64ba4af6042c (diff) | |
| download | openssl-a6a466d7b6f6d623a8f6e8b597958a039b32c003.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.
| -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 ce199be81..6870368ff 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 4603cdafc..608f3208d 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; |