add AES ciphers

[openssl.git] / apps / progs.pl

diff --git a/apps/progs.pl b/apps/progs.pl
index 2c4d034e4cc88ab63c8bae5d22ebdfebc9723d9d..1eed87390c6243cac55be32234cc43cfcdabf8af 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -1,6 +1,7 @@
 #!/usr/local/bin/perl
 
-print "/* This file was generated by progs.pl. */\n\n";
+print "/* apps/progs.h */\n";
+print "/* automatically generated by progs.pl for openssl.c */\n\n";
 
 grep(s/^asn1pars$/asn1parse/,@ARGV);
 
@@ -9,8 +10,6 @@ foreach (@ARGV)
 
 print <<'EOF';
 
-#ifdef SSLEAY_SRC  /* Defined only in openssl.c. */
-
 #define FUNC_TYPE_GENERAL      1
 #define FUNC_TYPE_MD           2
 #define FUNC_TYPE_CIPHER       3
@@ -29,28 +28,31 @@ foreach (@ARGV)
        push(@files,$_);
        $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
        if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-               { print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))\n${str}#endif\n"; } 
-       elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ) 
-               { print "#ifndef NO_RSA\n${str}#endif\n";  }
+               { print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+       elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
+               { print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
        elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
-               { print "#ifndef NO_DSA\n${str}#endif\n"; }
-       elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/))
-               { print "#ifndef NO_DH\n${str}#endif\n"; }
+               { print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
+               { print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
        elsif ( ($_ =~ /^pkcs12$/))
-               { print "#if !defined(NO_DES) && !defined(NO_SHA1)\n${str}#endif\n"; }
+               { print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
        else
                { print $str; }
        }
 
-foreach ("md2","md5","sha","sha1","mdc2","rmd160")
+foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
        {
        push(@files,$_);
        printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
        }
 
 foreach (
+       "aes-128-cbc", "aes-128-ecb",
+       "aes-192-cbc", "aes-192-ecb",
+       "aes-256-cbc", "aes-256-ecb",
        "base64",
-       "des", "des3", "desx", "idea", "rc4", "rc4-64", "rc4-40",
+       "des", "des3", "desx", "idea", "rc4", "rc4-40",
        "rc2", "bf", "cast", "rc5",
        "des-ecb", "des-ede",    "des-ede3",
        "des-cbc", "des-ede-cbc","des-ede3-cbc",
@@ -65,16 +67,15 @@ foreach (
        push(@files,$_);
 
        $t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
-       if    ($_ =~ /des/)  { $t="#ifndef NO_DES\n${t}#endif\n"; }
-       elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }
-       elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }
-       elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }
-       elsif ($_ =~ /bf/)   { $t="#ifndef NO_BF\n${t}#endif\n"; }
-       elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }
-       elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }
+       if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }
+       elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }
+       elsif ($_ =~ /idea/) { $t="#ifndef OPENSSL_NO_IDEA\n${t}#endif\n"; }
+       elsif ($_ =~ /rc4/)  { $t="#ifndef OPENSSL_NO_RC4\n${t}#endif\n"; }
+       elsif ($_ =~ /rc2/)  { $t="#ifndef OPENSSL_NO_RC2\n${t}#endif\n"; }
+       elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }
+       elsif ($_ =~ /cast/) { $t="#ifndef OPENSSL_NO_CAST\n${t}#endif\n"; }
+       elsif ($_ =~ /rc5/)  { $t="#ifndef OPENSSL_NO_RC5\n${t}#endif\n"; }
        print $t;
        }
 
 print "\t{0,NULL,NULL}\n\t};\n";
-print "#endif\n\n";
-