Commit e9fcdd2e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson Committed by Matt Caswell
Browse files

add test for CVE-2016-7053 

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 610b6626

test/d2i-tests/bad-cms.der

0 → 100644
+0 −0

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

test/d2i_test.c

+3 −1
Changes for test/d2i_test.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <openssl/err.h>

#include <openssl/x509.h>

#include <openssl/x509v3.h>

#include <openssl/cms.h>

#include "e_os.h"



static const ASN1_ITEM *item_type;
@@ -149,7 +150,8 @@ int main(int argc, char **argv) 
        ASN1_ITEM_ref(ASN1_ANY),

        ASN1_ITEM_ref(X509),

        ASN1_ITEM_ref(GENERAL_NAME),

        ASN1_ITEM_ref(ASN1_INTEGER)

        ASN1_ITEM_ref(ASN1_INTEGER),

        ASN1_ITEM_ref(CMS_ContentInfo)

    };



    static error_enum expected_errors[] = {

test/recipes/25-test_d2i.t

+8 −1
Changes for test/recipes/25-test_d2i.t: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; 


setup("test_d2i");



plan tests => 13;

plan tests => 14;



ok(run(test(["d2i_test", "X509", "decode",

             srctop_file('test','d2i-tests','bad_cert.der')])),
@@ -79,3 +79,10 @@ ok(run(test(["d2i_test", "ASN1_INTEGER", "decode", 
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



ok(run(test(["d2i_test", "CMS_ContentInfo", "decode",

             srctop_file('test','d2i-tests','bad-cms.der')])),

   "Running d2i_test bad-cms.der CMS ContentInfo");