Traditional Yuletide commit ;-)
authorDr. Stephen Henson <steve@openssl.org>
Fri, 25 Dec 2009 14:13:11 +0000 (14:13 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 25 Dec 2009 14:13:11 +0000 (14:13 +0000)
Add Triple DES CFB1 and CFB8 to algorithm list and NID translation.

crypto/evp/c_allc.c
crypto/evp/evp_lib.c

index bafb81b..c5f9268 100644 (file)
@@ -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());
index b92a662..218af71 100644 (file)
@@ -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);