Always try to set ASN.1 parameters for CMS.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 21 Mar 2016 15:48:51 +0000 (15:48 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 5 May 2016 22:55:10 +0000 (23:55 +0100)
commit493d732ab1f0311d925e6b9d56f0003012f93353
tree861e78dbef3b5025543ac8184c8632b2041d871f
parentb9284c75acc2db7bd117b7759a640b90a8e37ae6
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: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 3fd60dc42288591737a35a90368d72dbd00fdef8)

Conflicts:
crypto/cms/cms_enc.c
crypto/cms/cms_enc.c