add AES ciphers

diff --git a/apps/progs.h b/apps/progs.h
index 10dec90d24bf50dbc6ce7fe5ab2d4b487e68de63..610f21efb0f63b4f7186e876eb6c277591db54df 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -120,6 +120,24 @@ FUNCTION functions[] = {
        {FUNC_TYPE_MD,"sha1",dgst_main},
        {FUNC_TYPE_MD,"mdc2",dgst_main},
        {FUNC_TYPE_MD,"rmd160",dgst_main},
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
+#endif
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main},
+#endif
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main},
+#endif
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main},
+#endif
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main},
+#endif
+#ifndef OPENSSL_NO_AES
+       {FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
+#endif
        {FUNC_TYPE_CIPHER,"base64",enc_main},
 #ifndef OPENSSL_NO_DES
        {FUNC_TYPE_CIPHER,"des",enc_main},

diff --git a/apps/progs.pl b/apps/progs.pl
index bce01132e687e5a6dcaf28d87839d3aeb65a0a81..1eed87390c6243cac55be32234cc43cfcdabf8af 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -48,7 +48,9 @@ foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
        }
 
 foreach (
-       "aes-129-ecb",
+       "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-40",
        "rc2", "bf", "cast", "rc5",
@@ -66,6 +68,7 @@ foreach (
 
        $t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\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"; }