Traditional Yuletide commit ;-)

Add Triple DES CFB1 and CFB8 to algorithm list and NID translation.

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index bafb81bfa0a6d3570621870edccfa4de3bf1fded..c5f9268378b0756ae8651220a3ece597a446b7c4 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -71,6 +71,8 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher(EVP_des_cfb8());
        EVP_add_cipher(EVP_des_ede_cfb());
        EVP_add_cipher(EVP_des_ede3_cfb());
+       EVP_add_cipher(EVP_des_ede3_cfb1());
+       EVP_add_cipher(EVP_des_ede3_cfb8());
 
        EVP_add_cipher(EVP_des_ofb());
        EVP_add_cipher(EVP_des_ede_ofb());

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index b92a6626fa41008bb5fb3c6e3d088a5b3c720097..218af7166e75d13030b9b553848efd9bcbcd4d16 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -159,6 +159,12 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx)
 
                return NID_des_cfb64;
 
+               case NID_des_ede3_cfb64:
+               case NID_des_ede3_cfb8:
+               case NID_des_ede3_cfb1:
+
+               return NID_des_cfb64;
+
                default:
                /* Check it has an OID and it is valid */
                otmp = OBJ_nid2obj(nid);