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:56:17 +0000 (23:56 +0100)
commit852034b8b20963594d2f37f8ae8eb83d3e538624
treea277f7381fb9b45db896ce1a9e00247bbcf5eede
parentb583c1bd069f6928c3973dc6d6864930f6c4bb3e
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