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

(cherry picked from commit 7ae6a4b659facfd7ad8131238aa1d349cb3fc951)

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 3d4c60db9e11124e7e2c9accbbaa20d1f299abc5..4a08393f1f03f085bee25360ba7ec2150918f01d 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -96,13 +96,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();
 

diff --git a/apps/progs.h b/apps/progs.h
index 79e479a33768dfde2a5fbc98c132cd28ef5a86c6..273361897b563a018725ebd098e1bf75fe7f5d50 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -106,16 +106,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},
@@ -125,7 +125,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},

diff --git a/apps/progs.pl b/apps/progs.pl
index de6fdeabbd63a495773af80d41de3b9c4217528e..8e2cff1626232fc6deffb59d807b987b1a73de8d 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -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$/))