commit 92cce3fe6dce2f659d6a5985197e1eb44a2dbd85
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Jan 25 10:33:26 2023 +0100
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Jan 25 10:33:26 2023 +0100
tree d3f2d6c3437c5573f364af745e8358344fad8730
parent f0e25c72d947280c6e7aecc2dce92aa248a010df

Use extension .csr.der to indicate format

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

tests/data_files/Makefile

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index fbf447c..f7728dd 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -93,51 +93,51 @@
 cert_example_multi.crt: cert_example_multi.csr
 	$(OPENSSL) x509 -req -CA $(test_ca_crt) -CAkey $(test_ca_key_file_rsa) -extfile $(test_ca_config_file) -extensions dns_alt_names -passin "pass:$(test_ca_pwd_rsa)" -set_serial 17 -days 3653 -sha256 -in $< > $@
 
-test_csr_v3_keyUsage.csr: rsa_pkcs1_1024_clear.pem
+test_csr_v3_keyUsage.csr.der: rsa_pkcs1_1024_clear.pem
 	$(OPENSSL) req -new -subj '/CN=etcd' -config $(test_ca_config_file) -key rsa_pkcs1_1024_clear.pem -outform DER -out $@ -reqexts csr_ext_v3_keyUsage
-test_csr_v3_subjectAltName.csr: rsa_pkcs1_1024_clear.pem
+test_csr_v3_subjectAltName.csr.der: rsa_pkcs1_1024_clear.pem
 	$(OPENSSL) req -new -subj '/CN=etcd' -config $(test_ca_config_file) -key rsa_pkcs1_1024_clear.pem -outform DER -out $@ -reqexts csr_ext_v3_subjectAltName
-test_csr_v3_nsCertType.csr: rsa_pkcs1_1024_clear.pem
+test_csr_v3_nsCertType.csr.der: rsa_pkcs1_1024_clear.pem
 	$(OPENSSL) req -new -subj '/CN=etcd' -config $(test_ca_config_file) -key rsa_pkcs1_1024_clear.pem -outform DER -out $@ -reqexts csr_ext_v3_nsCertType
-test_csr_v3_all.csr: rsa_pkcs1_1024_clear.pem
+test_csr_v3_all.csr.der: rsa_pkcs1_1024_clear.pem
 	$(OPENSSL) req -new -subj '/CN=etcd' -config $(test_ca_config_file) -key rsa_pkcs1_1024_clear.pem -outform DER -out $@ -reqexts csr_ext_v3_all
-test_csr_v3_all_malformed_extensions_sequence_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extensions_sequence_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/300B0603551D0F040403/200B0603551D0F040403/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_id_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_id_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/0603551D0F0404030201/0703551D0F0404030201/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_data_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_data_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/040403020102302F0603/050403020102302F0603/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_data_len1.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_data_len1.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/040403020102302F0603/040503020102302F0603/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_data_len2.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_data_len2.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/040403020102302F0603/040303020102302F0603/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/03020102302F0603551D/04020102302F0603551D/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/3026A02406082B060105/4026A02406082B060105/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/04020780300D06092A86/03020780300D06092A86/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_duplicated_extension.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_duplicated_extension.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/551D11/551D0F/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_extension_type_oid.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_extension_type_oid.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/551D11/551DFF/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_sequence_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_sequence_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/306006092A864886F70D/406006092A864886F70D/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_id_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_id_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/06092A864886F70D0109/07092A864886F70D0109/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_extension_request.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_extension_request.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/2A864886F70D01090E/2A864886F70D01090F/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/31533051300B0603551D/32533051300B0603551D/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/3051300B0603551D0F04/3151300B0603551D0F04/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_len1.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_len1.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/306006092A864886F70D/306106092A864886F70D/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_len2.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_len2.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/306006092A864886F70D/305906092A864886F70D/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/3051300B0603551D0F04/3052300B0603551D0F04/" | xxd -r -p ) > $@
-test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr: test_csr_v3_all.csr
+test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr.der: test_csr_v3_all.csr.der
 	(hexdump -ve '1/1 "%.2X"' $< | sed "s/3051300B0603551D0F04/3050300B0603551D0F04/" | xxd -r -p ) > $@
 
 $(test_ca_key_file_rsa_alt):test-ca.opensslconf

tests/data_files/test_csr_v3_all.csr.der

diff --git a/tests/data_files/test_csr_v3_all.csr b/tests/data_files/test_csr_v3_all.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all.csr
rename to tests/data_files/test_csr_v3_all.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_extension_request.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_extension_request.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_extension_request.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len1.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_len2.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_sequence_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_extension_request_set_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_id_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_id_tag.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_id_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_id_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_id_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_len1.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_len1.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_len1.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_len1.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_len1.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_len2.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_len2.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_len2.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_len2.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_len2.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_attributes_sequence_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_attributes_sequence_tag.csr b/tests/data_files/test_csr_v3_all_malformed_attributes_sequence_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_attributes_sequence_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_attributes_sequence_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_duplicated_extension.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_duplicated_extension.csr b/tests/data_files/test_csr_v3_all_malformed_duplicated_extension.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_duplicated_extension.csr
rename to tests/data_files/test_csr_v3_all_malformed_duplicated_extension.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_data_len1.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_data_len1.csr b/tests/data_files/test_csr_v3_all_malformed_extension_data_len1.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_data_len1.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_data_len1.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_data_len2.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_data_len2.csr b/tests/data_files/test_csr_v3_all_malformed_extension_data_len2.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_data_len2.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_data_len2.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_data_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_data_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extension_data_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_data_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_data_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_id_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_id_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extension_id_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_id_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_id_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_key_usage_bitstream_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr
deleted file mode 100644
index 7e717f3..0000000
--- a/tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr
+++ /dev/null
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all.csr b/tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr.der
similarity index 100%
copy from tests/data_files/test_csr_v3_all.csr
copy to tests/data_files/test_csr_v3_all_malformed_extension_ns_cert_bitstream_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_subject_alt_name_sequence_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extension_type_oid.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extension_type_oid.csr b/tests/data_files/test_csr_v3_all_malformed_extension_type_oid.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extension_type_oid.csr
rename to tests/data_files/test_csr_v3_all_malformed_extension_type_oid.csr.der
Binary files differ

tests/data_files/test_csr_v3_all_malformed_extensions_sequence_tag.csr.der

diff --git a/tests/data_files/test_csr_v3_all_malformed_extensions_sequence_tag.csr b/tests/data_files/test_csr_v3_all_malformed_extensions_sequence_tag.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_all_malformed_extensions_sequence_tag.csr
rename to tests/data_files/test_csr_v3_all_malformed_extensions_sequence_tag.csr.der
Binary files differ

tests/data_files/test_csr_v3_keyUsage.csr.der

diff --git a/tests/data_files/test_csr_v3_keyUsage.csr b/tests/data_files/test_csr_v3_keyUsage.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_keyUsage.csr
rename to tests/data_files/test_csr_v3_keyUsage.csr.der
Binary files differ

tests/data_files/test_csr_v3_nsCertType.csr.der

diff --git a/tests/data_files/test_csr_v3_nsCertType.csr b/tests/data_files/test_csr_v3_nsCertType.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_nsCertType.csr
rename to tests/data_files/test_csr_v3_nsCertType.csr.der
Binary files differ

tests/data_files/test_csr_v3_subjectAltName.csr.der

diff --git a/tests/data_files/test_csr_v3_subjectAltName.csr b/tests/data_files/test_csr_v3_subjectAltName.csr.der
similarity index 100%
rename from tests/data_files/test_csr_v3_subjectAltName.csr
rename to tests/data_files/test_csr_v3_subjectAltName.csr.der
Binary files differ