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 7054d8125dca585d1cf373d33abe46eccd8caad4..e45cee8ab08041e2a4221cf386db3615994bdee3 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 174cf6c5942f5e5f9d7a3aaebe8405a10daf3a9e..9c200617a65f7ee7c3796d93e1c217bc40962f24 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -163,6 +163,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);