commit 8993a1456712177d326ce029e8c0c2ff99c55463
author Xiaokang Qian <xiaokang.qian@arm.com> Mon Mar 06 08:32:20 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Tue Mar 07 08:38:58 2023 +0000
tree 5733bdae246c93c6d10930e6d5f61709a9f6bff6
parent e8c696ffd10579f0f983eb7a7f8146566f14b8cb

Add unexpected tag cases for signer info 1 and 2

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

tests/data_files/Makefile

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 341ceb0..53d5e1d 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -1390,12 +1390,22 @@
 	echo '\x72' | xxd -p -r | dd of=$@ bs=1 seek=438 conv=notrunc
 all_final += pkcs7_data_signed_badsigner1_badsize.der
 
+pkcs7_data_signed_badsigner1_badtag.der: pkcs7_data_3_signed.der
+	cp pkcs7_data_3_signed.der $@
+	echo '\xa1' | xxd -p -r | dd of=$@ bs=1 seek=442 conv=notrunc
+all_final += pkcs7_data_signed_badsigner1_badtag.der
+
 # pkcs7 signature file with corrupted signer info[2]
 pkcs7_data_signed_badsigner2_badsize.der: pkcs7_data_3_signed.der
 	cp pkcs7_data_3_signed.der $@
 	echo '\x72'| xxd -p -r | dd of=$@ bs=1 seek=813 conv=notrunc
 all_final += pkcs7_data_signed_badsigner2_badsize
 
+pkcs7_data_signed_badsigner2_badtag.der: pkcs7_data_3_signed.der
+	cp pkcs7_data_3_signed.der $@
+	echo '\xa1'| xxd -p -r | dd of=$@ bs=1 seek=817 conv=notrunc
+all_final += pkcs7_data_signed_badsigner2_badtag
+
 # pkcs7 file with version 2
 pkcs7_data_cert_signed_v2.der: pkcs7_data_cert_signed_sha256.der
 	cp pkcs7_data_cert_signed_sha256.der $@

tests/suites/test_suite_pkcs7.data

diff --git a/tests/suites/test_suite_pkcs7.data b/tests/suites/test_suite_pkcs7.data
index 478bb9d..7df4ac8 100644
--- a/tests/suites/test_suite_pkcs7.data
+++ b/tests/suites/test_suite_pkcs7.data
@@ -38,6 +38,14 @@
 depends_on:MBEDTLS_SHA256_C
 pkcs7_parse:"data_files/pkcs7_data_signed_badsigner2_badsize.der":MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO
 
+PKCS7 Signed Data Parse Fail with corrupted signer info[1] unexpected tag #6.3
+depends_on:MBEDTLS_SHA256_C
+pkcs7_parse:"data_files/pkcs7_data_signed_badsigner1_badtag.der":MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO,MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+
+PKCS7 Signed Data Parse Fail with corrupted signer info[2] unexpected tag #6.4
+depends_on:MBEDTLS_SHA256_C
+pkcs7_parse:"data_files/pkcs7_data_signed_badsigner2_badtag.der":MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO,MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+
 PKCS7 Signed Data Parse Fail Version other than 1 #7
 depends_on:MBEDTLS_SHA256_C
 pkcs7_parse:"data_files/pkcs7_data_cert_signed_v2.der":MBEDTLS_ERR_PKCS7_INVALID_VERSION