RT4175: Fix PKCS7_verify() regression with Authenticode signatures
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 23 Feb 2016 14:00:03 +0000 (14:00 +0000)
committerRich Salz <rsalz@openssl.org>
Tue, 23 Feb 2016 15:16:15 +0000 (10:16 -0500)
commitc436c990f68938fdda1f2bd703bf0cd8dbfa49d2
treecbda954ffd537a0754b2e78a7c709389b6b581e0
parentf78baa9d715a00cb691c3c74791308fb131a833c
RT4175: Fix PKCS7_verify() regression with Authenticode signatures

This is a partial revert of commit c8491de39 ("GH354: Memory leak fixes"),
which was cherry-picked from commit 55500ea7c in OpenSSL 1.1.

That commit introduced a change in behaviour which is a regression for
software implementing Microsoft Authenticode — which requires a PKCS#7
signature to be validated against explicit external data, even though
it's a non-detached signature with its own embedded data.

The is fixed differently in OpenSSL 1.1 by commit 6b2ebe433 ("Add
PKCS7_NO_DUAL_CONTENT flag"), but that approach isn't viable in the
1.0.2 stable branch, so just comment the offending check back out again.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
crypto/pkcs7/pk7_smime.c