From: Richard Levitte Date: Wed, 19 Oct 2016 20:54:06 +0000 (+0200) Subject: Fix no-des X-Git-Tag: OpenSSL_1_0_2k~64 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10e60f26cef02a6310d20cc2c918184fc9100d14;p=oweals%2Fopenssl.git Fix no-des Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1748) --- diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 82182c29b8..4e7de438a7 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -1110,4 +1110,6 @@ static int set_pbe(BIO *err, int *ppbe, const char *str) return 1; } +#else +static void *dummy = &dummy; #endif diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 2cfcdb29cd..ee283172d3 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();