From 4f3755f05de6f771b19d7b8c455330eae9a2c52e Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 11 Jun 2026 16:58:48 +0200 Subject: [PATCH 1/2] data_files: makefile: remove duplicated "-out" parameter from PKCS7 generation Signed-off-by: Valerio Setti --- data_files/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data_files/Makefile b/data_files/Makefile index 5a379a99a..d138104ca 100644 --- a/data_files/Makefile +++ b/data_files/Makefile @@ -2438,7 +2438,7 @@ all_final += pkcs7-rsa-expired.crt # File with an otherwise valid signature signed with an expired cert pkcs7_data_rsa_expired.der: pkcs7-rsa-expired.key pkcs7-rsa-expired.crt pkcs7_data.bin - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha256 -inkey pkcs7-rsa-expired.key -signer pkcs7-rsa-expired.crt -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -inkey pkcs7-rsa-expired.key -signer pkcs7-rsa-expired.crt -noattr -outform DER -out $@ all_final += pkcs7_data_rsa_expired.der # Convert signing certs to DER for testing PEM-free builds @@ -2461,42 +2461,42 @@ all_final += pkcs7_zerolendata_detached.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 $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ all_final += pkcs7_data_cert_signed_sha256.der # pkcs7 signature file with CERT and sha1 pkcs7_data_cert_signed_sha1.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha1 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha1 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ all_final += pkcs7_data_cert_signed_sha1.der # pkcs7 signature file with CERT and sha512 pkcs7_data_cert_signed_sha512.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha512 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha512 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ all_final += pkcs7_data_cert_signed_sha512.der # pkcs7 signature file without CERT pkcs7_data_without_cert_signed.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 -nocerts -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -nocerts -noattr -outform DER -out $@ all_final += pkcs7_data_without_cert_signed.der # pkcs7 signature file with signature pkcs7_data_with_signature.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 -nocerts -noattr -nodetach -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -nocerts -noattr -nodetach -outform DER -out $@ all_final += pkcs7_data_with_signature.der # pkcs7 signature file with two signers pkcs7_data_multiple_signed.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) $(pkcs7_test_cert_2) - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -nocerts -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -nocerts -noattr -outform DER -out $@ all_final += pkcs7_data_multiple_signed.der # pkcs7 signature file with three signers pkcs7_data_3_signed.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) $(pkcs7_test_cert_2) $(pkcs7_test_cert_3) - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -signer pkcs7-rsa-sha256-3.pem -nocerts -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -signer pkcs7-rsa-sha256-3.pem -nocerts -noattr -outform DER -out $@ all_final += pkcs7_data_3_signed.der # pkcs7 signature file with multiple certificates pkcs7_data_multiple_certs_signed.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) $(pkcs7_test_cert_2) - $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -out $@ -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -noattr -outform DER -out $@ + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha256 -signer pkcs7-rsa-sha256-1.pem -signer pkcs7-rsa-sha256-2.pem -noattr -outform DER -out $@ all_final += pkcs7_data_multiple_certs_signed.der # pkcs7 signature file with corrupted CERT From c550de0d99e7221d5fcafe40622cc1883ba8422e Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 11 Jun 2026 17:13:59 +0200 Subject: [PATCH 2/2] data_files: pkcs7: add PKCS7 files using MD5 and RIPEMD160 Adjust the Makefile accordingly. Signed-off-by: Valerio Setti --- data_files/Makefile | 8 ++++++++ data_files/pkcs7_data_cert_signed_md5.der | Bin 0 -> 1282 bytes data_files/pkcs7_data_cert_signed_ripemd160.der | Bin 0 -> 1276 bytes 3 files changed, 8 insertions(+) create mode 100644 data_files/pkcs7_data_cert_signed_md5.der create mode 100644 data_files/pkcs7_data_cert_signed_ripemd160.der diff --git a/data_files/Makefile b/data_files/Makefile index d138104ca..b954d5626 100644 --- a/data_files/Makefile +++ b/data_files/Makefile @@ -2469,6 +2469,14 @@ pkcs7_data_cert_signed_sha1.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha1 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ all_final += pkcs7_data_cert_signed_sha1.der +pkcs7_data_cert_signed_md5.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md md5 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ +all_final += pkcs7_data_cert_signed_md5.der + +pkcs7_data_cert_signed_ripemd160.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) + $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md ripemd160 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ +all_final += pkcs7_data_cert_signed_ripemd160.der + # pkcs7 signature file with CERT and sha512 pkcs7_data_cert_signed_sha512.der: $(pkcs7_test_file) $(pkcs7_test_cert_1) $(OPENSSL) smime -sign -binary -in pkcs7_data.bin -md sha512 -signer pkcs7-rsa-sha256-1.pem -noattr -outform DER -out $@ diff --git a/data_files/pkcs7_data_cert_signed_md5.der b/data_files/pkcs7_data_cert_signed_md5.der new file mode 100644 index 0000000000000000000000000000000000000000..1804ba0193c6937d91b08a5a3af2cd1769c8a8d9 GIT binary patch literal 1282 zcmXqLV)@6$snzDu_MMlJooPW6%X@<+me)*-jD~y$JZu~g875X%1_N${I>rS}%)SOq z%$^2KOoj`XnHZUvM3j@x3au6O+t8dgv-8xKw%cB(!XF#(!u2q61C1~-115*PFLjyxgL&GR> zUSnh~nWi=|Dj_?Mk(GhDiIJbdpox)-sfm%1Vb-G1vuT&tNX%KSxUyu0MZnXJ&|Ttx zPyG9u#=ri_Ny|0qy*sxlEZS8$$vx|->bd_nm(KR7<-hm3yiD`?qE;PmZX02i;9hkX z4x6Ljmk4vT>bD#`Vaoo}=}pl3n{nC&`im6$yGyTBep=}FiuDTrZC{=;$HT>H(GzTV z?(TIs$~x(;PUm9v9ZKa9zcp1NI?rsgucCR&BbI;sJd35%U4ZM_ zP7TqUORRSWy<;i1F}IcY9Lp~hA(HW+=ScR8KRyK?;N!8UM4e8ZZMX z2v=q$-BJa;EGvWCL9V7u4(An_+QpkGu>|SB86XOwbyH!_P@2>vs5Ji)ZR*y z{S)qQZgC4bcO~)W=D7zYxRY}H8guwN9%sMHo!kH4WJ=+L={W~~{yQMme&GJ5M+>>j z);9Msp`2;ktS)x^|JE?wvf%e}_b#Q-5W$zJTel>dS*-AT(kJ}7^isqW zxg`&E-{s%og})ppqH>S(8#XbP0h3-4Fyk5cke8xyWI@zSjFcgPDW0W?ks;ts z^gWR|8{IU*#DiAZ>=#{`#J1^_yU@{DW&c`wK4c#_wl&3H>qYdFKSisK395hhx1Rnv zsMpCtV8=$^PmSj*nGdTMCH>(&a>9%MOSimj(G7+w#$%Bz$L`nd^Jt%57wr64k=f*_ z%BPpVja?^K9XuDzd(TyP(u?TApl4sSSznsI%I95E|1{bwoNTPxD$GobtPBR+2t|wwnwWhJ znwUKenwSh10Hv9jM3j@x3au6O+t8dgv-8xKw%cB(!XF#(!u2q61C1~No5&o>!Y0h* z=VQocz{3XQaPhDPcsmE18;TkTgZRumJYc?pb81nEf}w$&IIoehfvJIop@E^Lp<$Fb zuQ4*0OjDZ}m5`kW^dWN-BR_*d6C)Q>6C)$TtVN+`(=M-(n6p}OWyuPQfTtayyTt#V z`1du9fBln_mTS^`cWzTyw5xKGd)8CcbN_EHo$XW0fA4j9ndb9FtvcS^Ho`2yz3MI; zHb=iN5$0&sZ#j6vl>MdCo1pbKlOanzC2})hl|ysC)n`Z z-Rp3ab<$m(&c*6Gl*%K1YpO)bnHJ6oe!eK`tANvWp4nz!Me~+NEdTg<7E7nQ0N1sh z8lpFsSnmva$5L!#ZY%LQmR~4BB;!HPk?a?Ld@TGXc-B~~^srqT5&USgp#}lkyGZLDI@B5(Z)o*cI@D6bLgi{%2t|UzC*}Ax=J0ns&VH9WxBtJ%l)?$qa}NIecR;HB!2L~+7IK%Z zZx9gLG;@oNGIQhhQrXH-0~U$5E2bXZ;_~;D)RL7k>G?ml^i)0U*O=t|&CdU}`SS-> zaY0sdH9B={eCn7&In%aTUF`V(tzo)l!SChnT}q)Lf-h6IZb>w=SmF1iPxy7|rHCnV zOCIXJ%fIoX`rMNXe>qM>J4+KIgWRUM z^8M4LTQ{%R7Z!9>s)>2YKEJI@ixzvA?mo1w=l!nev=_$RuW#M_*?Q9Pm|gR_)R5Vx zuX23Q8{6DzN*_`YAisy7d!e<_x4T9>)%$;KImUB*>diKGD4P6WVd-43fS+?~S zPa)Hd6A2Zru~Yf}_^erX=