| commit | fc234b7b52af978e0bff0c79a8f685bf9ab839b0 | [log] [tgz] |
|---|---|---|
| author | Nick Child <nick.child@ibm.com> | Wed Nov 02 15:23:39 2022 -0500 |
| committer | Nick Child <nick.child@ibm.com> | Thu Nov 03 09:24:20 2022 -0500 |
| tree | 33c24cd278e39dcee4f8cca51857526a2f27d70a | |
| parent | 3951a4f3ada028d08e50d32ab837f0a226afd0b0 [diff] |
test/pkcs7: Add Windows CRLF EOF to data files Windows tests are failing pkcs7 verification due to differnt line endings. Therefore, add make instuctions for building the data files with Windows EOF instead. As a result, regenerate other data files so that verification works. Add these CRLF EOF files to the exception in check_files to ignore the line endings. Signed-off-by: Nick Child <nick.child@ibm.com>
diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile index b92944a..581de25 100644 --- a/tests/data_files/Makefile +++ b/tests/data_files/Makefile
@@ -1136,6 +1136,14 @@ pkcs7_test_cert_2 = pkcs7-rsa-sha256-2.crt pkcs7_test_file = pkcs7_data.bin +$(pkcs7_test_file): + echo -e "Hello\xd" > $@ +all_final += $(pkcs7_test_file) + +pkcs7_data_1.bin: + echo -e "2\xd" > $@ +all_final += pkcs7_data_1.bin + # Generate signing cert pkcs7-rsa-sha256-1.crt: $(OPENSSL) req -x509 -subj="/C=NL/O=PKCS7/CN=PKCS7 Cert 1" -sha256 -nodes -days 365 -newkey rsa:2048 -keyout pkcs7-rsa-sha256-1.key -out pkcs7-rsa-sha256-1.crt
diff --git a/tests/data_files/pkcs7_data.bin b/tests/data_files/pkcs7_data.bin index e965047..40ee264 100644 --- a/tests/data_files/pkcs7_data.bin +++ b/tests/data_files/pkcs7_data.bin
@@ -1 +1 @@ -Hello +Hello
diff --git a/tests/data_files/pkcs7_data_1.bin b/tests/data_files/pkcs7_data_1.bin index 0cfbf08..78c6bae 100644 --- a/tests/data_files/pkcs7_data_1.bin +++ b/tests/data_files/pkcs7_data_1.bin
@@ -1 +1 @@ -2 +2
diff --git a/tests/data_files/pkcs7_data_cert_encrypted.der b/tests/data_files/pkcs7_data_cert_encrypted.der index 763057d..b7b1c83 100644 --- a/tests/data_files/pkcs7_data_cert_encrypted.der +++ b/tests/data_files/pkcs7_data_cert_encrypted.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_cert_signed_sha1.der b/tests/data_files/pkcs7_data_cert_signed_sha1.der index b6f9599..fb1deb0 100644 --- a/tests/data_files/pkcs7_data_cert_signed_sha1.der +++ b/tests/data_files/pkcs7_data_cert_signed_sha1.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_cert_signed_sha256.der b/tests/data_files/pkcs7_data_cert_signed_sha256.der index 778fb7b..8dc2f4c 100644 --- a/tests/data_files/pkcs7_data_cert_signed_sha256.der +++ b/tests/data_files/pkcs7_data_cert_signed_sha256.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_cert_signed_sha512.der b/tests/data_files/pkcs7_data_cert_signed_sha512.der index 41849a9..a4aa587 100644 --- a/tests/data_files/pkcs7_data_cert_signed_sha512.der +++ b/tests/data_files/pkcs7_data_cert_signed_sha512.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_cert_signed_v2.der b/tests/data_files/pkcs7_data_cert_signed_v2.der index befd17c..4f4cb04 100644 --- a/tests/data_files/pkcs7_data_cert_signed_v2.der +++ b/tests/data_files/pkcs7_data_cert_signed_v2.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_cert_signeddata_sha256.der b/tests/data_files/pkcs7_data_cert_signeddata_sha256.der index 85ea9f9..cb7d751 100644 --- a/tests/data_files/pkcs7_data_cert_signeddata_sha256.der +++ b/tests/data_files/pkcs7_data_cert_signeddata_sha256.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_multiple_certs_signed.der b/tests/data_files/pkcs7_data_multiple_certs_signed.der index 69371ae..4a237e9 100644 --- a/tests/data_files/pkcs7_data_multiple_certs_signed.der +++ b/tests/data_files/pkcs7_data_multiple_certs_signed.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_multiple_signed.der b/tests/data_files/pkcs7_data_multiple_signed.der index 5821a7c..095b80c 100644 --- a/tests/data_files/pkcs7_data_multiple_signed.der +++ b/tests/data_files/pkcs7_data_multiple_signed.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_signed_badcert.der b/tests/data_files/pkcs7_data_signed_badcert.der index 1da6e6a..ed00f65 100644 --- a/tests/data_files/pkcs7_data_signed_badcert.der +++ b/tests/data_files/pkcs7_data_signed_badcert.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_signed_badsigner.der b/tests/data_files/pkcs7_data_signed_badsigner.der index aff1448..aa5447c 100644 --- a/tests/data_files/pkcs7_data_signed_badsigner.der +++ b/tests/data_files/pkcs7_data_signed_badsigner.der Binary files differ
diff --git a/tests/data_files/pkcs7_data_without_cert_signed.der b/tests/data_files/pkcs7_data_without_cert_signed.der index dbff326..b47fe92 100644 --- a/tests/data_files/pkcs7_data_without_cert_signed.der +++ b/tests/data_files/pkcs7_data_without_cert_signed.der Binary files differ
diff --git a/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der b/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der index 2973ccd..898ca67 100644 --- a/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der +++ b/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der Binary files differ
diff --git a/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der b/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der index 2db3590..f4b4e38 100644 --- a/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der +++ b/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der Binary files differ