From 106cb9505746ddb69dc07ef45232084e620940ec Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 23 Apr 2016 13:52:43 +0100 Subject: [PATCH] Add test for CVE-2016-2018 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper --- test/d2i-tests/high_tag.der | Bin 0 -> 6 bytes test/recipes/25-test_d2i.t | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/d2i-tests/high_tag.der diff --git a/test/d2i-tests/high_tag.der b/test/d2i-tests/high_tag.der new file mode 100644 index 0000000000000000000000000000000000000000..5c523ecde54f87d4ec5b5c0adb362e02f6b6a4e7 GIT binary patch literal 6 Ncmb1dVq#)o000A60Hy!{ literal 0 HcmV?d00001 diff --git a/test/recipes/25-test_d2i.t b/test/recipes/25-test_d2i.t index 9e1a643aaf..d50de0431b 100644 --- a/test/recipes/25-test_d2i.t +++ b/test/recipes/25-test_d2i.t @@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_d2i"); -plan tests => 3; +plan tests => 4; ok(run(test(["d2i_test", "X509", "decode", srctop_file('test','d2i-tests','bad_cert.der')])), @@ -28,3 +28,12 @@ ok(run(test(["d2i_test", "GENERAL_NAME", "decode", ok(run(test(["d2i_test", "ASN1_ANY", "BIO", srctop_file('test','d2i-tests','bad_bio.der')])), "Running d2i_test bad_bio.der"); +# This test checks CVE-2016-2108. The data consists of an tag 258 and +# two zero content octets. This is parsed as an ASN1_ANY type. If the +# type is incorrectly interpreted as an ASN.1 INTEGER the two zero content +# octets will be reject as invalid padding and this test will fail. +# If the type is correctly interpreted it will by treated as an ASN1_STRING +# type and the content octets copied verbatim. +ok(run(test(["d2i_test", "ASN1_ANY", "OK", + srctop_file('test','d2i-tests','high_tag.der')])), + "Running d2i_test high_tag.der"); -- GitLab