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

Make no-ssl3 no-ssl2 do more sensible things.

parent 528b1f9a

apps/ciphers.c

+0 −6
Original line number Diff line number Diff line
@@ -100,13 +100,7 @@ int MAIN(int argc, char **argv) 
	char buf[512];

	BIO *STDout=NULL;



#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



	apps_startup();

apps/progs.h

+4 −4
Original line number Diff line number Diff line
@@ -107,16 +107,16 @@ FUNCTION functions[] = { 
	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},

#endif

	{FUNC_TYPE_GENERAL,"genpkey",genpkey_main},

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_server",s_server_main},

#endif

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_client",s_client_main},

#endif

#ifndef OPENSSL_NO_SPEED

	{FUNC_TYPE_GENERAL,"speed",speed_main},

#endif

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_time",s_time_main},

#endif

	{FUNC_TYPE_GENERAL,"version",version_main},
@@ -126,7 +126,7 @@ FUNCTION functions[] = { 
#endif

	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},

	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},

#endif

	{FUNC_TYPE_GENERAL,"nseq",nseq_main},

apps/progs.pl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ foreach (@ARGV) 
	push(@files,$_);

	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";

	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))

		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 

		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 

	elsif ( ($_ =~ /^speed$/))

		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }

	elsif ( ($_ =~ /^engine$/))