From 45525d37688e8b3d9918ca8b59591a3604a9c6db Mon Sep 17 00:00:00 2001
From: Nick Child <nick.child@ibm.com>
Date: Fri, 25 Feb 2022 11:54:34 -0600
Subject: [PATCH] pkcs7: Fix dependencies for pkcs7 tests

Fixes include removing PEM dependency for greater
coverage when PEM config is not set and defining
test dependencies at the appropriate level.

Signed-off-by: Nick Child <nick.child@ibm.com>
---
 tests/data_files/Makefile               |   9 +++++++
 tests/data_files/pkcs7-rsa-sha256-1.der | Bin 0 -> 845 bytes
 tests/data_files/pkcs7-rsa-sha256-2.der | Bin 0 -> 845 bytes
 tests/suites/test_suite_pkcs7.data      |  33 +++++++++++++++++-------
 tests/suites/test_suite_pkcs7.function  |  26 +++++++++----------
 5 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 tests/data_files/pkcs7-rsa-sha256-1.der
 create mode 100644 tests/data_files/pkcs7-rsa-sha256-2.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 8c7520fe3..b92944ac2 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -1147,6 +1147,15 @@ pkcs7-rsa-sha256-2.crt:
 	cat pkcs7-rsa-sha256-2.crt pkcs7-rsa-sha256-2.key > pkcs7-rsa-sha256-2.pem
 all_final += pkcs7-rsa-sha256-2.crt
 
+# Convert signing certs to DER for testing PEM-free builds
+pkcs7-rsa-sha256-1.der: $(pkcs7_test_cert_1)
+	$(OPENSSL) x509 -in pkcs7-rsa-sha256-1.crt -out $@ -outform DER
+all_final += pkcs7-rsa-sha256-1.der
+
+pkcs7-rsa-sha256-2.der: $(pkcs7_test_cert_2)
+	$(OPENSSL) x509 -in pkcs7-rsa-sha256-2.crt -out $@ -outform DER
+all_final += pkcs7-rsa-sha256-2.der
+
 # pkcs7 signature file with CERT
 pkcs7_data_cert_signed_sha256.der: $(pkcs7_test_file) $(pkcs7_test_cert_1)
 	$(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha256 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@
diff --git a/tests/data_files/pkcs7-rsa-sha256-1.der b/tests/data_files/pkcs7-rsa-sha256-1.der
new file mode 100644
index 0000000000000000000000000000000000000000..622df1e7a38899b4da3a3601badd4fb36a333238
GIT binary patch
literal 845
zcmXqLV)is>VlrI7%*4pVBw`>aSo3skbeK)@x~&Pb%e4X`66YH5vT<s)d9;1!Wn|=L
zWiT)?<Tl`BV-96u6K3-BG2}Dg0dcr^SOdJBgUt;^4TM2_W*#0eU%@%Gs6@fgKu(<3
z$iUFh$i&dZ(7@0#3dl7?;*x1<6QdHc^B7qfn41{+84Q{jxtN+585xeha#xz}w){!|
zhv3%i4+YELuR8K5E!9tWHOH>wH$JbLRo$llQJx_~g5mBnX^&@X|JJO&8<>!io&TlW
zro-4;JEAuDYNN)--fN5-t|xtF7Lu-iUAfBf+tqG=Gq2y%bU4?&2yXx6eQHw6U)8Xy
zMM94^9|__wtI8HMSpHz6c;9>ZBQxahJUw~6p7V9_gHwxm=dr(=r|=`|)~hYe?{9~n
zNI8DK*?g|R>foMoU7f$8_jc`!klwqvZN}gC$NN_I?cVFeaa`d?6Sv~mzc&pYvWW#Q
z_EPiaEP0UA_93qFZdUsDuBFq=rzP>!^@jWn@%^y=*w-JjA6&lY8((<(?vdYxBiCjx
zaAaa;WMEtzY!GN53yc(5J{B<+k=WS#3ojMliz!!~ar(=|l;3Jm<(vlcAZcY52?MbP
z><ain3WOOM|Ff_fFas&%U<alOV6ZbXbTy<*2@v`8M<S|lxm&V$_oa@d|M~s@=}f5G
z`(j5*norh}jLa{8bp*6_to7_I6IZ`u{CxGia0!J)PrdV(US7kaBh#`WTxjz#&&JZX
z^BTU@>hCTPm>zwz`M|_mN_W4RJ-=L~sV{Wl43ClijajNM!=@<N^5r^&NBiFrTKPul
zkKW~-7h_uAd^O(kBJtaq%(+F*;y)K%`Ey{YSIc&n{F`@#lTvmsZ~r}iX<=Z_G^IOc
zy?b)+%Jj8F?EIcr#kO%qWZvpFF|M8mg0_Dcf)+_%v#DA8L-zeEl^*u_JFlsi8{M<-
mWs<$#G)ww$QzFOJTS{fU$3H}FYM<L%`D9l`f}6&t2~Pp}*H`xd

literal 0
HcmV?d00001

diff --git a/tests/data_files/pkcs7-rsa-sha256-2.der b/tests/data_files/pkcs7-rsa-sha256-2.der
new file mode 100644
index 0000000000000000000000000000000000000000..a88ecb45126aed4764c06702fa09fa29dd2b184f
GIT binary patch
literal 845
zcmXqLV)is>VlrI7%*4pVB;vW}r~J}88hi8BWNs3_WV?Uu`Gdy|c-c6$+C196^D;7W
zvoaW%7;+nMvN4CUun9By`55vU@PIg6JgfoU&cWt}q6WesJ~Iywn6KcRT2!K7WFRNb
zYh++(Xk=n&VrXD!83p7TB5}zywTV#)*?Ekt49rc8{0s(7j9g4jjEoHTbQwJM<Uez{
z^GI+1-LSG3Q&zHw+b!mud*$(6-iJr;IqhwjdG~@wBJ*6E*KW~5_defwxzfqrYrdk_
zgucVxbD9O_eP6b4x%|Pf&ulNmW^Wgn9@*Kp-|OUzKy!VbH<Lc?wLe~vk#uwFtAAfK
zl(nua)QQ|VyGPN(yq%*!GHOxCmR$}E8dE;){QYU($IqrK0=?C@dQ9flG4)V<uO!%C
zp?3KpYk0yP5BtQQx6XaYs9Gzt%Wcb)HQpj0Yxl&=+$=C{!>#213~Tme+zeW^Cn^8C
z6LaszO_qWe4PI|NF7e`ke%*;W!>u8ypL1h3Obqg>Y!DE=wYef??!!=aiHYyN%D)a>
z|9&kKGb01z;$VY716g3C$nvp>v4~tR+OThf|EhWoz7Kz&zhqYZ{U`LMfjmfBnMJ}t
ztO2_MevkrTM#ldvtOm?L3OU$;sR9`6j0_7W9hH8e|1gug>20SSQ|G(#6Dx}qwf3bP
zsi>&j$`Z1uOff%e=G$ZTDOV<OOtHD0xz$DW&OYmd#$B_fn1uUJ)^Ax>7Cf)zdRK7X
zhL7Jw^C!MqY#6uU>4P)6o}I_9%Bb|jZ|dz?vwT(TvHS(=S6WZilkTY675Y`e>kH#v
z?T&<#|6-@@Ph-)!aCKgL;ewDzO)1Cyr$x`K4xK2eb+j(4<;d1d!^h!1%>f(M`OAOu
z$+EL3Zu$Ld*{iSOKZ4sgPc#*mJ0h@w_paFFNBWcAzZBVbKh#Ta>J3%?<iGPfA_S9t
o|G(RIFF1sEjzGXnCFh8s)<3S%W_OQh|DEi3T!QcarU+9-0O~_iJpcdz

literal 0
HcmV?d00001

diff --git a/tests/suites/test_suite_pkcs7.data b/tests/suites/test_suite_pkcs7.data
index 4af0edad3..d5ecd21cc 100644
--- a/tests/suites/test_suite_pkcs7.data
+++ b/tests/suites/test_suite_pkcs7.data
@@ -1,56 +1,71 @@
 PKCS7 Signed Data Parse Pass SHA256 #1
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse:"data_files/pkcs7_data_cert_signed_sha256.der"
 
 PKCS7 Signed Data Parse Pass SHA1 #2
-depends_on:MBEDTLS_SHA1_C
+depends_on:MBEDTLS_SHA1_C:MBEDTLS_SHA256_C
 pkcs7_parse:"data_files/pkcs7_data_cert_signed_sha1.der"
 
 PKCS7 Signed Data Parse Pass Without CERT #3
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_without_cert:"data_files/pkcs7_data_without_cert_signed.der"
 
 PKCS7 Signed Data Parse Fail with multiple signers #4
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_multiple_signers:"data_files/pkcs7_data_multiple_signed.der"
 
 PKCS7 Signed Data Parse Fail with multiple certs #4
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_multiple_signers:"data_files/pkcs7_data_multiple_certs_signed.der"
 
 PKCS7 Signed Data Parse Fail with corrupted cert #5
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_corrupted_cert:"data_files/pkcs7_data_signed_badcert.der"
 
 PKCS7 Signed Data Parse Fail with corrupted signer info #6
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_corrupted_signer_info:"data_files/pkcs7_data_signed_badsigner.der"
 
 PKCS7 Signed Data Parse Fail Version other than 1 #7
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_version:"data_files/pkcs7_data_cert_signed_v2.der"
 
 PKCS7 Signed Data Parse Fail Encrypted Content #8
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_content_oid:"data_files/pkcs7_data_cert_encrypted.der"
 
 PKCS7 Signed Data Verification Pass SHA256 #9
-pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.crt":"data_files/pkcs7_data.bin"
+depends_on:MBEDTLS_SHA256_C
+pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.der":"data_files/pkcs7_data.bin"
 
 PKCS7 Signed Data Verification Pass SHA256 #9.1
-pkcs7_verify_hash:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.crt":"data_files/pkcs7_data.bin"
+depends_on:MBEDTLS_SHA256_C
+pkcs7_verify_hash:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.der":"data_files/pkcs7_data.bin"
 
 PKCS7 Signed Data Verification Pass SHA1 #10
-depends_on:MBEDTLS_SHA1_C
-pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha1.der":"data_files/pkcs7-rsa-sha256-1.crt":"data_files/pkcs7_data.bin"
+depends_on:MBEDTLS_SHA1_C:MBEDTLS_SHA256_C
+pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha1.der":"data_files/pkcs7-rsa-sha256-1.der":"data_files/pkcs7_data.bin"
 
 PKCS7 Signed Data Verification Pass SHA512 #11
-depends_on:MBEDTLS_SHA512_C
-pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha512.der":"data_files/pkcs7-rsa-sha256-1.crt":"data_files/pkcs7_data.bin"
+depends_on:MBEDTLS_SHA512_C:MBEDTLS_SHA256_C
+pkcs7_verify:"data_files/pkcs7_data_cert_signed_sha512.der":"data_files/pkcs7-rsa-sha256-1.der":"data_files/pkcs7_data.bin"
 
 PKCS7 Signed Data Verification Fail because of different certificate #12
-pkcs7_verify_badcert:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-2.crt":"data_files/pkcs7_data.bin"
+depends_on:MBEDTLS_SHA256_C
+pkcs7_verify_badcert:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-2.der":"data_files/pkcs7_data.bin"
 
 PKCS7 Signed Data Verification Fail because of different data hash #13
-pkcs7_verify_tampered_data:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.crt":"data_files/pkcs7_data_1.bin"
+depends_on:MBEDTLS_SHA256_C
+pkcs7_verify_tampered_data:"data_files/pkcs7_data_cert_signed_sha256.der":"data_files/pkcs7-rsa-sha256-1.der":"data_files/pkcs7_data_1.bin"
 
 PKCS7 Signed Data Parse Failure Corrupt signerInfo.issuer #15.1
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_failure:"data_files/pkcs7_signerInfo_issuer_invalid_size.der"
 
 PKCS7 Signed Data Parse Failure Corrupt signerInfo.serial #15.2
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse_failure:"data_files/pkcs7_signerInfo_serial_invalid_size.der"
 
 PKCS7 Only Signed Data Parse Pass #15
+depends_on:MBEDTLS_SHA256_C
 pkcs7_parse:"data_files/pkcs7_data_cert_signeddata_sha256.der"
diff --git a/tests/suites/test_suite_pkcs7.function b/tests/suites/test_suite_pkcs7.function
index e2d76f36a..8b35c5755 100644
--- a/tests/suites/test_suite_pkcs7.function
+++ b/tests/suites/test_suite_pkcs7.function
@@ -10,11 +10,11 @@
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
- * depends_on:MBEDTLS_PKCS7_C:MBEDTLS_FS_IO
+ * depends_on:MBEDTLS_PKCS7_C
  * END_DEPENDENCIES
  */
 
-/* BEGIN_CASE depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_RSA_C */
 void pkcs7_parse( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -37,7 +37,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_SHA256_C*/
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
 void pkcs7_parse_without_cert( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -60,7 +60,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_RSA_C */
 void pkcs7_parse_multiple_signers( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -95,7 +95,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_RSA_C */
 void pkcs7_parse_corrupted_cert( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -118,7 +118,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_RSA_C */
 void pkcs7_parse_corrupted_signer_info( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -141,7 +141,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
 void pkcs7_parse_version( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -164,7 +164,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
 void pkcs7_parse_content_oid( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -186,7 +186,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C */
 void pkcs7_verify( char *pkcs7_file, char *crt, char *filetobesigned )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -236,7 +236,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
 void pkcs7_verify_hash( char *pkcs7_file, char *crt, char *filetobesigned )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -299,7 +299,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C */
 void pkcs7_verify_badcert( char *pkcs7_file, char *crt, char *filetobesigned )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -349,7 +349,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA256_C */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C */
 void pkcs7_verify_tampered_data( char *pkcs7_file, char *crt, char *filetobesigned )
 {
     unsigned char *pkcs7_buf = NULL;
@@ -399,7 +399,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
 void pkcs7_parse_failure( char *pkcs7_file )
 {
     unsigned char *pkcs7_buf = NULL;