Commit 10e60f26 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix no-des 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1748)
parent 1c6aab6a

apps/pkcs12.c

+2 −0
Original line number Diff line number Diff line
@@ -1110,4 +1110,6 @@ static int set_pbe(BIO *err, int *ppbe, const char *str) 
    return 1;

}



#else

static void *dummy = &dummy;

#endif

crypto/cms/cms_kari.c

+4 −1
Original line number Diff line number Diff line
@@ -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();