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:
parent
d68d160cb7
commit
3bf4e14cc3
@ -622,13 +622,7 @@ int MAIN(int argc, char **argv)
|
|||||||
SRP_ARG srp_arg = {NULL,NULL,0,0,0,1024};
|
SRP_ARG srp_arg = {NULL,NULL,0,0,0,1024};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
|
|
||||||
meth=SSLv23_client_method();
|
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();
|
apps_startup();
|
||||||
c_Pause=0;
|
c_Pause=0;
|
||||||
|
@ -969,17 +969,7 @@ int MAIN(int argc, char *argv[])
|
|||||||
char *srpuserseed = NULL;
|
char *srpuserseed = NULL;
|
||||||
char *srp_verifier_file = NULL;
|
char *srp_verifier_file = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
|
|
||||||
meth=SSLv23_server_method();
|
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_argc=argc;
|
||||||
local_argv=argv;
|
local_argv=argv;
|
||||||
|
Loading…
Reference in New Issue
Block a user