From: Richard Levitte <levitte@openssl.org>
Date: Thu, 10 Nov 2016 00:49:47 +0000 (+0100)
Subject: Fix no-cms (CVE-2016-7053)
X-Git-Tag: OpenSSL_1_1_1-pre1~3106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d7ce8d42b80fda2566c70f0d4de4069bb34e72c;p=thirdparty%2Fopenssl.git

Fix no-cms (CVE-2016-7053)

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/test/recipes/25-test_d2i.t b/test/recipes/25-test_d2i.t
index e663534c4d..688c8ed7ac 100644
--- a/test/recipes/25-test_d2i.t
+++ b/test/recipes/25-test_d2i.t
@@ -12,6 +12,7 @@ use warnings;
 
 use File::Spec;
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_d2i");
 
@@ -80,9 +81,13 @@ ok(run(test(["d2i_test", "ASN1_INTEGER", "decode",
              srctop_file('test','d2i-tests','bad-int-padminus1.der')])),
    "Running d2i_test bad-int-padminus1.der INTEGER");
 
-# Invalid CMS structure with decode error in CHOICE value.
-# Test for CVE-2016-7053
+SKIP: {
+  skip "No CMS support in this configuration", 1 if disabled("cms");
 
-ok(run(test(["d2i_test", "CMS_ContentInfo", "decode",
-             srctop_file('test','d2i-tests','bad-cms.der')])),
-   "Running d2i_test bad-cms.der CMS ContentInfo");
+  # Invalid CMS structure with decode error in CHOICE value.
+  # Test for CVE-2016-7053
+
+  ok(run(test(["d2i_test", "CMS_ContentInfo", "decode",
+               srctop_file('test','d2i-tests','bad-cms.der')])),
+     "Running d2i_test bad-cms.der CMS ContentInfo");
+}