Commit 493d732a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Always try to set ASN.1 parameters for CMS. 



Try to set the ASN.1 parameters for CMS encryption even if the IV
length is zero as the underlying cipher should still set the type.

This will correctly result in errors if an attempt is made to use
an unsupported cipher type.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 3fd60dc4)

Conflicts:
	crypto/cms/cms_enc.c
parent b9284c75

crypto/cms/cms_enc.c

+14 −11
Original line number Diff line number Diff line
@@ -180,9 +180,8 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) 
        goto err;

    }



    if (piv) {

    calg->parameter = ASN1_TYPE_new();

        if (!calg->parameter) {

    if (calg->parameter == NULL) {

        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, ERR_R_MALLOC_FAILURE);

        goto err;

    }
@@ -191,6 +190,10 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec) 
               CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);

        goto err;

    }

    /* If parameter type not set omit parameter */

    if (calg->parameter->type == V_ASN1_UNDEF) {

        ASN1_TYPE_free(calg->parameter);

        calg->parameter = NULL;

    }

    ok = 1;