Make kerberos ciphersuite code work with newer header files

[openssl.git] / apps / progs.pl

diff --git a/apps/progs.pl b/apps/progs.pl
index 1eed87390c6243cac55be32234cc43cfcdabf8af..36569d2661c32e79e645cb10147bf7b2e124cfee 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -16,8 +16,8 @@ print <<'EOF';
 
 typedef struct {
        int type;
-       char *name;
-       int (*func)();
+       const char *name;
+       int (*func)(int argc,char *argv[]);
        } FUNCTION;
 
 FUNCTION functions[] = {
@@ -29,10 +29,16 @@ foreach (@ARGV)
        $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"; } 
+       elsif ( ($_ =~ /^speed$/))
+               { print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^engine$/))
+               { print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n"; }
        elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
                { print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
        elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
                { print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^ec$/) || ($_ =~ /^ecparam$/))
+               { print "#ifndef OPENSSL_NO_EC\n${str}#endif\n";}
        elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
                { print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
        elsif ( ($_ =~ /^pkcs12$/))
@@ -44,7 +50,7 @@ foreach (@ARGV)
 foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
        {
        push(@files,$_);
-       printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
+       printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";
        }
 
 foreach (