root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Dr. Stephen Henson 2012-03-18 18:18:30 +00:00
parent e351e2a7cf
commit a9101cdcaa
3 changed files with 613 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1244
apps/Makefile
View File

File diff suppressed because it is too large Load Diff

6
apps/s_client.c
View File

@ -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;

6
apps/s_server.c
View File

@ -781,13 +781,7 @@ int MAIN(int argc, char *argv[])
tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
#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;