diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-25 14:12:24 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-25 14:12:24 +0000 |
| commit | aed461b43138ba6667216664a7ec7a012e96a61d (patch) | |
| tree | 531cc73882f0b8e44a8a2bb9923abcc949f3a487 /crypto/evp | |
| parent | 8bbd0e826cc798db4c5b06e95dbb961ad0552a78 (diff) | |
Traditional Yuletide commit ;-)
Add Triple DES CFB1 and CFB8 to algorithm list and NID translation.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/c_allc.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_lib.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index bafb81bfa0..c5f9268378 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 b92a6626fa..218af7166e 100644 --- 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); |