From 2c7fe4dc9ae0c84d2c398d57143983800cc3f18d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 26 Apr 2016 12:12:40 +0100 Subject: [PATCH] Add ASN.1 INTEGER tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add tests for ASN.1 INTEGER: invalid tag, valid 0, 1, -1 and 0, -1 with illegal padding. Also add ASN1_ANY tests for 0, 1 and -1. Reviewed-by: Emilia Käsper --- test/d2i-tests/bad-int-pad0.der | Bin 0 -> 4 bytes test/d2i-tests/bad-int-padminus1.der | 1 + test/d2i-tests/int0.der | Bin 0 -> 3 bytes test/d2i-tests/int1.der | 1 + test/d2i-tests/intminus1.der | 1 + test/recipes/25-test_d2i.t | 44 ++++++++++++++++++++++++++- 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 test/d2i-tests/bad-int-pad0.der create mode 100644 test/d2i-tests/bad-int-padminus1.der create mode 100644 test/d2i-tests/int0.der create mode 100644 test/d2i-tests/int1.der create mode 100644 test/d2i-tests/intminus1.der diff --git a/test/d2i-tests/bad-int-pad0.der b/test/d2i-tests/bad-int-pad0.der new file mode 100644 index 0000000000000000000000000000000000000000..46f6092a82cc4cc6da99cccea7a21469cb1e7364 GIT binary patch literal 4 LcmZQ#VqgFO01^NN literal 0 HcmV?d00001 diff --git a/test/d2i-tests/bad-int-padminus1.der b/test/d2i-tests/bad-int-padminus1.der new file mode 100644 index 0000000000..a4b6bb9792 --- /dev/null +++ b/test/d2i-tests/bad-int-padminus1.der @@ -0,0 +1 @@ +ÿÿ \ No newline at end of file diff --git a/test/d2i-tests/int0.der b/test/d2i-tests/int0.der new file mode 100644 index 0000000000000000000000000000000000000000..bbfb76b9d33ea5e7fdd2d8e33ee8660b9063da24 GIT binary patch literal 3 KcmZQ#WB>pF3jhQF literal 0 HcmV?d00001 diff --git a/test/d2i-tests/int1.der b/test/d2i-tests/int1.der new file mode 100644 index 0000000000..26dd6b16d9 --- /dev/null +++ b/test/d2i-tests/int1.der @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/d2i-tests/intminus1.der b/test/d2i-tests/intminus1.der new file mode 100644 index 0000000000..e7c1cea38c --- /dev/null +++ b/test/d2i-tests/intminus1.der @@ -0,0 +1 @@ +ÿ \ No newline at end of file diff --git a/test/recipes/25-test_d2i.t b/test/recipes/25-test_d2i.t index d50de0431b..77afe3fb9f 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 => 4; +plan tests => 13; ok(run(test(["d2i_test", "X509", "decode", srctop_file('test','d2i-tests','bad_cert.der')])), @@ -37,3 +37,45 @@ ok(run(test(["d2i_test", "ASN1_ANY", "BIO", ok(run(test(["d2i_test", "ASN1_ANY", "OK", srctop_file('test','d2i-tests','high_tag.der')])), "Running d2i_test high_tag.der"); + +# Above test data but interpeted as ASN.1 INTEGER: this will be rejected +# because the tag is invalid. +ok(run(test(["d2i_test", "ASN1_INTEGER", "decode", + srctop_file('test','d2i-tests','high_tag.der')])), + "Running d2i_test high_tag.der INTEGER"); + +# Parse valid 0, 1 and -1 ASN.1 INTEGER as INTEGER or ANY. + +ok(run(test(["d2i_test", "ASN1_INTEGER", "OK", + srctop_file('test','d2i-tests','int0.der')])), + "Running d2i_test int0.der INTEGER"); + +ok(run(test(["d2i_test", "ASN1_INTEGER", "OK", + srctop_file('test','d2i-tests','int1.der')])), + "Running d2i_test int1.der INTEGER"); + +ok(run(test(["d2i_test", "ASN1_INTEGER", "OK", + srctop_file('test','d2i-tests','intminus1.der')])), + "Running d2i_test intminus1.der INTEGER"); + +ok(run(test(["d2i_test", "ASN1_ANY", "OK", + srctop_file('test','d2i-tests','int0.der')])), + "Running d2i_test int0.der ANY"); + +ok(run(test(["d2i_test", "ASN1_ANY", "OK", + srctop_file('test','d2i-tests','int1.der')])), + "Running d2i_test int1.der ANY"); + +ok(run(test(["d2i_test", "ASN1_ANY", "OK", + srctop_file('test','d2i-tests','intminus1.der')])), + "Running d2i_test intminus1.der ANY"); + +# Integers with illegal additional padding. + +ok(run(test(["d2i_test", "ASN1_INTEGER", "decode", + srctop_file('test','d2i-tests','bad-int-pad0.der')])), + "Running d2i_test bad-int-pad0.der INTEGER"); + +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"); -- 2.34.1