diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 18:32:12 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 18:32:12 +0000 |
| commit | 5315173646e65b5025be33013edc33eb9658e683 (patch) | |
| tree | 06e2ebfcb3177eeb3cba0775d8e3ed98577e77da /crypto/cms | |
| parent | e656c34a188598ebce6423c4fbc4860921d41be4 (diff) | |
Notes
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 2cfcdb29cd50..ee283172d3d8 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -401,9 +401,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(); |