diff options
author | jsing <> | 2019-08-11 14:27:01 +0000 |
---|---|---|
committer | jsing <> | 2019-08-11 14:27:01 +0000 |
commit | d56b735f343f8fee02106002ed86d743f970425c (patch) | |
tree | b74ef2b8a769054cd8e71f7ce6e9e02d140d7639 | |
parent | 44c4c19d37de905fca6ed2bcce92dc0d8b19ea22 (diff) | |
download | openbsd-d56b735f343f8fee02106002ed86d743f970425c.tar.gz openbsd-d56b735f343f8fee02106002ed86d743f970425c.tar.bz2 openbsd-d56b735f343f8fee02106002ed86d743f970425c.zip |
Disable DES3 since we do not currently provide DES3 keywrap.
-rw-r--r-- | src/lib/libcrypto/cms/cms_kari.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms_kari.c b/src/lib/libcrypto/cms/cms_kari.c index bc234d2e22..21e3ce8254 100644 --- a/src/lib/libcrypto/cms/cms_kari.c +++ b/src/lib/libcrypto/cms/cms_kari.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_kari.c,v 1.12 2019/08/11 11:07:40 jsing Exp $ */ | 1 | /* $OpenBSD: cms_kari.c,v 1.13 2019/08/11 14:27:01 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -411,10 +411,16 @@ cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari, const EVP_CIPHER *cipher) | |||
411 | * DES3 wrap otherwise use AES wrap similar to key size. | 411 | * DES3 wrap otherwise use AES wrap similar to key size. |
412 | */ | 412 | */ |
413 | #ifndef OPENSSL_NO_DES | 413 | #ifndef OPENSSL_NO_DES |
414 | #if 0 | ||
415 | /* | ||
416 | * XXX - we do not currently support DES3 wrap and probably should just | ||
417 | * drop this code. | ||
418 | */ | ||
414 | if (EVP_CIPHER_type(cipher) == NID_des_ede3_cbc) | 419 | if (EVP_CIPHER_type(cipher) == NID_des_ede3_cbc) |
415 | kekcipher = EVP_des_ede3_wrap(); | 420 | kekcipher = EVP_des_ede3_wrap(); |
416 | else | 421 | else |
417 | #endif | 422 | #endif |
423 | #endif | ||
418 | if (keylen <= 16) | 424 | if (keylen <= 16) |
419 | kekcipher = EVP_aes_128_wrap(); | 425 | kekcipher = EVP_aes_128_wrap(); |
420 | else if (keylen <= 24) | 426 | else if (keylen <= 24) |