Commit bbbe61c9 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent df27a351

apps/s_client.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

apps/s_server.c

+0 −10
Original line number Diff line number Diff line
@@ -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;