commit 9c703d80ca351513548eaf535f416707dc330a18
author Xiaokang Qian <xiaokang.qian@arm.com> Mon Mar 06 08:44:12 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Tue Mar 07 08:38:58 2023 +0000
tree 0a2c2f0c8ae3c6fa7e7d889b8eaea02928c1927b
parent 8993a1456712177d326ce029e8c0c2ff99c55463

Add fuzz bad 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 53d5e1d..9df46aa 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -1395,6 +1395,11 @@
 	echo '\xa1' | xxd -p -r | dd of=$@ bs=1 seek=442 conv=notrunc
 all_final += pkcs7_data_signed_badsigner1_badtag.der
 
+pkcs7_data_signed_badsigner1_fuzzbad.der: pkcs7_data_3_signed.der
+	cp pkcs7_data_3_signed.der $@
+	echo '\xa1' | xxd -p -r | dd of=$@ bs=1 seek=550 conv=notrunc
+all_final += pkcs7_data_signed_badsigner1_fuzzbad.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 $@
@@ -1406,6 +1411,11 @@
 	echo '\xa1'| xxd -p -r | dd of=$@ bs=1 seek=817 conv=notrunc
 all_final += pkcs7_data_signed_badsigner2_badtag
 
+pkcs7_data_signed_badsigner2_fuzzbad.der: pkcs7_data_3_signed.der
+	cp pkcs7_data_3_signed.der $@
+	echo '\xa1'| xxd -p -r | dd of=$@ bs=1 seek=925 conv=notrunc
+all_final += pkcs7_data_signed_badsigner2_fuzzbad
+
 # 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 7df4ac8..d7b248f 100644
--- a/tests/suites/test_suite_pkcs7.data
+++ b/tests/suites/test_suite_pkcs7.data
@@ -46,6 +46,14 @@
 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 with corrupted signer info[1] fuzz bad #6.5
+depends_on:MBEDTLS_SHA256_C
+pkcs7_parse:"data_files/pkcs7_data_signed_badsigner1_fuzzbad.der":MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO
+
+PKCS7 Signed Data Parse Fail with corrupted signer info[2] fuzz bad #6.6
+depends_on:MBEDTLS_SHA256_C
+pkcs7_parse:"data_files/pkcs7_data_signed_badsigner2_fuzzbad.der":MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO
+
 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