From c22050be29909df889d14c45d6a068bb76355637 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 25 Dec 2009 14:11:18 +0000 Subject: [PATCH] Traditional Yuletide commit ;-) Add Triple DES CFB1 and CFB8 to algorithm list and NID translation. --- crypto/evp/c_allc.c | 2 ++ crypto/evp/evp_lib.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index 7054d8125d..e45cee8ab0 100644 --- 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 174cf6c594..9c200617a6 100644 --- 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); -- 2.25.1