Fix s_server -ssl2. Previously this reported "Error setting EC curve"

[oweals/openssl.git] / apps / progs.pl

diff --git a/apps/progs.pl b/apps/progs.pl
index af5776054fd58169cdbc205fc675f933d85edef0..2b1efd8fed33effc1a2dabf845208b6c45e96a94 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -22,6 +22,7 @@ typedef struct {
        const char *name;
        int (*func)(int argc,char *argv[]);
        } FUNCTION;
+DECLARE_LHASH_OF(FUNCTION);
 
 FUNCTION functions[] = {
 EOF
@@ -31,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$/))
@@ -48,11 +49,15 @@ foreach (@ARGV)
                { print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
        elsif ( ($_ =~ /^cms$/))
                { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^ocsp$/))
+               { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^srp$/))
+               { print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
        else
                { print $str; }
        }
 
-foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
+foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160","sha224","sha256","sha384","sha512")
        {
        push(@files,$_);
        printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";