summaryrefslogtreecommitdiffstats
path: root/crypto/evp/evp_lib.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2004-01-28 20:05:35 +0100
committerRichard Levitte <levitte@openssl.org>2004-01-28 20:05:35 +0100
commit8d1ebe0bd16238e0e9c5c8050154390ba89fa266 (patch)
treef53f09ab1b7e801608d169f8d6baa1fc7d604903 /crypto/evp/evp_lib.c
parentmake update (diff)
downloadopenssl-8d1ebe0bd16238e0e9c5c8050154390ba89fa266.tar.xz
openssl-8d1ebe0bd16238e0e9c5c8050154390ba89fa266.zip
Add the missing parts for DES CFB1 and CFB8.
Add the corresponding AES parts while I'm at it. make update
Diffstat (limited to 'crypto/evp/evp_lib.c')
-rw-r--r--crypto/evp/evp_lib.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index c97cb9cea6..b532c45de3 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -135,6 +135,30 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx)
return NID_rc4;
+ case NID_aes_128_cfb128:
+ case NID_aes_128_cfb8:
+ case NID_aes_128_cfb1:
+
+ return NID_aes_128_cfb128;
+
+ case NID_aes_192_cfb128:
+ case NID_aes_192_cfb8:
+ case NID_aes_192_cfb1:
+
+ return NID_aes_192_cfb128;
+
+ case NID_aes_256_cfb128:
+ case NID_aes_256_cfb8:
+ case NID_aes_256_cfb1:
+
+ return NID_aes_256_cfb128;
+
+ case NID_des_cfb64:
+ case NID_des_cfb8:
+ case NID_des_cfb1:
+
+ return NID_des_cfb64;
+
default:
/* Check it has an OID and it is valid */
otmp = OBJ_nid2obj(nid);