A general spring-cleaning (in autumn) to fix up signed/unsigned warnings.

[openssl.git] / crypto / evp / c_allc.c

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index def53b67858ef1ca0e681acade4801001a2e2379..341a958fd4728b0816dbf0d826b473bef5aae751 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -82,11 +82,7 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_des_cbc,"DES");
        EVP_add_cipher_alias(SN_des_cbc,"des");
        EVP_add_cipher(EVP_des_ede_cbc());
-# ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-       EVP_add_cipher(EVP_dev_crypto_des_ede3_cbc());
-# else
        EVP_add_cipher(EVP_des_ede3_cbc());
-# endif
        EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
        EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
 
@@ -153,10 +149,31 @@ 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
        PKCS12_PBE_add();
        PKCS5_PBE_add();