diff options
author | Richard Levitte <levitte@openssl.org> | 2016-11-10 01:49:47 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-11-10 13:04:11 +0000 |
commit | 9d7ce8d42b80fda2566c70f0d4de4069bb34e72c (patch) | |
tree | 693977b311248f61a41f15928ef582981ece4198 | |
parent | 70d8b304d01b9e0c4ec182db20c33aa0698cda51 (diff) | |
download | openssl-9d7ce8d42b80fda2566c70f0d4de4069bb34e72c.tar.gz |
Fix no-cms (CVE-2016-7053)
Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r-- | test/recipes/25-test_d2i.t | 15 |
1 files changed, 10 insertions, 5 deletions
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"); +} |