diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-18 15:56:06 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 17:07:11 +0000 |
| commit | 96bea0002b44f1f490a798d6122d6b15d1fe6b09 (patch) | |
| tree | 8483f3d6eca4c15f020ec3fc3384c418d29f529f /crypto/cms | |
| parent | 40a8e9c2effc655413e8283fb31e7cffeeb6154a (diff) | |
Fix no-des
Numerous fixes for no-des.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_kari.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 79634ad456..562b1e506c 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -389,9 +389,12 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari, * Pick a cipher based on content encryption cipher. If it is DES3 use * DES3 wrap otherwise use AES wrap similar to key size. */ +#ifndef OPENSSL_NO_DES if (EVP_CIPHER_type(cipher) == NID_des_ede3_cbc) kekcipher = EVP_des_ede3_wrap(); - else if (keylen <= 16) + else +#endif + if (keylen <= 16) kekcipher = EVP_aes_128_wrap(); else if (keylen <= 24) kekcipher = EVP_aes_192_wrap(); |