Declare the CFB and OFB modes for AES, and prepare for a declaration

of CTR mode.

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index 37e6ab83a5d3e5231474654ce25720dd224ad46c..341a958fd4728b0816dbf0d826b473bef5aae751 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -149,14 +149,29 @@ void OpenSSL_add_all_ciphers(void)
 #ifndef OPENSSL_NO_AES
        EVP_add_cipher(EVP_aes_128_ecb());
        EVP_add_cipher(EVP_aes_128_cbc());
+       EVP_add_cipher(EVP_aes_128_cfb());
+       EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_128_ctr());
+#endif
        EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
        EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
        EVP_add_cipher(EVP_aes_192_ecb());
        EVP_add_cipher(EVP_aes_192_cbc());
+       EVP_add_cipher(EVP_aes_192_cfb());
+       EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_192_ctr());
+#endif
        EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
        EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
        EVP_add_cipher(EVP_aes_256_ecb());
        EVP_add_cipher(EVP_aes_256_cbc());
+       EVP_add_cipher(EVP_aes_256_cfb());
+       EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_256_ctr());
+#endif
        EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
        EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
 #endif

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 061c5d175d6ec93aa320923adbd2691e4900b781..7c333af4a97317b8de5373dc0f9a417f90fb1efc 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -660,10 +660,25 @@ const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
 #ifndef OPENSSL_NO_AES
 const EVP_CIPHER *EVP_aes_128_ecb(void);
 const EVP_CIPHER *EVP_aes_128_cbc(void);
+const EVP_CIPHER *EVP_aes_128_cfb(void);
+const EVP_CIPHER *EVP_aes_128_ofb(void);
+#if 0
+const EVP_CIPHER *EVP_aes_128_ctr(void);
+#endif
 const EVP_CIPHER *EVP_aes_192_ecb(void);
 const EVP_CIPHER *EVP_aes_192_cbc(void);
+const EVP_CIPHER *EVP_aes_192_cfb(void);
+const EVP_CIPHER *EVP_aes_192_ofb(void);
+#if 0
+const EVP_CIPHER *EVP_aes_192_ctr(void);
+#endif
 const EVP_CIPHER *EVP_aes_256_ecb(void);
 const EVP_CIPHER *EVP_aes_256_cbc(void);
+const EVP_CIPHER *EVP_aes_256_cfb(void);
+const EVP_CIPHER *EVP_aes_256_ofb(void);
+#if 0
+const EVP_CIPHER *EVP_aes_256_ctr(void);
+#endif
 #endif
 
 void OPENSSL_add_all_algorithms_noconf(void);