rename ecdsa_secp*sha* to ecdsa_secp*
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 8694dba..0af27fe 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -1088,41 +1088,42 @@
all_final += cert_md5.crt
# TLSv1.3 test certificates
-ecdsa_secp256r1_sha256.key: ec_256_prv.pem
+ecdsa_secp256r1.key: ec_256_prv.pem
ln -s $< $@
-ecdsa_secp256r1_sha256.csr: ecdsa_secp256r1_sha256.key
- $(OPENSSL) req -new -subj "/C=NL/O=PolarSSL/CN=localhost" \
- -key $< -out $@
-all_intermediate += ecdsa_secp256r1_sha256.csr
-ecdsa_secp256r1_sha256.crt: ecdsa_secp256r1_sha256.csr
- $(OPENSSL) x509 -req -CA $(test_ca_crt_file_ec) -CAkey $(test_ca_key_file_ec) \
- -set_serial 77 -days 3653 -sha256 -in $< -out $@
-all_final += ecdsa_secp256r1_sha256.crt ecdsa_secp256r1_sha256.key
-tls13_certs: ecdsa_secp256r1_sha256.crt ecdsa_secp256r1_sha256.key
-ecdsa_secp384r1_sha384.key: ec_384_prv.pem
- ln -s $< $@
-ecdsa_secp384r1_sha384.csr: ecdsa_secp384r1_sha384.key
+ecdsa_secp256r1.csr: ecdsa_secp256r1.key
$(OPENSSL) req -new -subj "/C=NL/O=PolarSSL/CN=localhost" \
-key $< -out $@
-all_intermediate += ecdsa_secp384r1_sha384.csr
-ecdsa_secp384r1_sha384.crt: ecdsa_secp384r1_sha384.csr
+all_intermediate += ecdsa_secp256r1.csr
+ecdsa_secp256r1.crt: ecdsa_secp256r1.csr
$(OPENSSL) x509 -req -CA $(test_ca_crt_file_ec) -CAkey $(test_ca_key_file_ec) \
-set_serial 77 -days 3653 -sha384 -in $< -out $@
-all_final += ecdsa_secp384r1_sha384.crt ecdsa_secp384r1_sha384.key
-tls13_certs: ecdsa_secp384r1_sha384.crt ecdsa_secp384r1_sha384.key
+all_final += ecdsa_secp256r1.crt ecdsa_secp256r1.key
+tls13_certs: ecdsa_secp256r1.crt ecdsa_secp256r1.key
-ecdsa_secp521r1_sha512.key: ec_521_prv.pem
+ecdsa_secp384r1.key: ec_384_prv.pem
ln -s $< $@
-ecdsa_secp521r1_sha512.csr: ecdsa_secp521r1_sha512.key
+ecdsa_secp384r1.csr: ecdsa_secp384r1.key
$(OPENSSL) req -new -subj "/C=NL/O=PolarSSL/CN=localhost" \
-key $< -out $@
-all_intermediate += ecdsa_secp521r1_sha512.csr
-ecdsa_secp521r1_sha512.crt: ecdsa_secp521r1_sha512.csr
+all_intermediate += ecdsa_secp384r1.csr
+ecdsa_secp384r1.crt: ecdsa_secp384r1.csr
$(OPENSSL) x509 -req -CA $(test_ca_crt_file_ec) -CAkey $(test_ca_key_file_ec) \
- -set_serial 77 -days 3653 -sha512 -in $< -out $@
-all_final += ecdsa_secp521r1_sha512.crt ecdsa_secp521r1_sha512.key
-tls13_certs: ecdsa_secp521r1_sha512.crt ecdsa_secp521r1_sha512.key
+ -set_serial 77 -days 3653 -sha384 -in $< -out $@
+all_final += ecdsa_secp384r1.crt ecdsa_secp384r1.key
+tls13_certs: ecdsa_secp384r1.crt ecdsa_secp384r1.key
+
+ecdsa_secp521r1.key: ec_521_prv.pem
+ ln -s $< $@
+ecdsa_secp521r1.csr: ecdsa_secp521r1.key
+ $(OPENSSL) req -new -subj "/C=NL/O=PolarSSL/CN=localhost" \
+ -key $< -out $@
+all_intermediate += ecdsa_secp521r1.csr
+ecdsa_secp521r1.crt: ecdsa_secp521r1.csr
+ $(OPENSSL) x509 -req -CA $(test_ca_crt_file_ec) -CAkey $(test_ca_key_file_ec) \
+ -set_serial 77 -days 3653 -sha384 -in $< -out $@
+all_final += ecdsa_secp521r1.crt ecdsa_secp521r1.key
+tls13_certs: ecdsa_secp521r1.crt ecdsa_secp521r1.key
################################################################
#### Diffie-Hellman parameters
diff --git a/tests/data_files/ecdsa_secp256r1.crt b/tests/data_files/ecdsa_secp256r1.crt
new file mode 100644
index 0000000..634d24c
--- /dev/null
+++ b/tests/data_files/ecdsa_secp256r1.crt
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBejCCAQACAU0wCgYIKoZIzj0EAwMwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEz
+MDAzMDgwMVoXDTMxMTIwMTAzMDgwMVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjO
+PQMBBwNCAAR3cmVvgUs5knnV4fF4H6xvCZo8XKGw41NRg0sItl4LVyWQza+PdpNh
+vPNKz8EeXgdOhCa93gS+bmU5RUSWF95FMAoGCCqGSM49BAMDA2gAMGUCMA06tTwD
+M1t8Chka41h1JKu4d0RsGk0MoinT9MxTAE/61ScZh5lKspOKrcavJ0maUQIxAIuj
+rarmd8+OyftTRp6Wpwwfpskdb7nm44YX6eZu/Odjfq/RAdhIcn4P9QXtOgVrbw==
+-----END CERTIFICATE-----
diff --git a/tests/data_files/ecdsa_secp256r1_sha256.key b/tests/data_files/ecdsa_secp256r1.key
similarity index 100%
rename from tests/data_files/ecdsa_secp256r1_sha256.key
rename to tests/data_files/ecdsa_secp256r1.key
diff --git a/tests/data_files/ecdsa_secp256r1_sha256.crt b/tests/data_files/ecdsa_secp256r1_sha256.crt
deleted file mode 100644
index e7e46c6..0000000
--- a/tests/data_files/ecdsa_secp256r1_sha256.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBejCCAQACAU0wCgYIKoZIzj0EAwIwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEy
-MjAzMTQyOVoXDTMxMTEyMzAzMTQyOVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAAR3cmVvgUs5knnV4fF4H6xvCZo8XKGw41NRg0sItl4LVyWQza+PdpNh
-vPNKz8EeXgdOhCa93gS+bmU5RUSWF95FMAoGCCqGSM49BAMCA2gAMGUCMQC2n8wV
-FGkDUu0O1sUmTfZ9hxj9YxmddY3xStnicIVxIwRtGh1ZEinAUlAUFOVSKvcCMEGb
-e9ap8blL/MIPywf6vr4WWo0GnTgD0XPwgVu8QrXwaHzhgF+x4S+qm3XLosgCjA==
------END CERTIFICATE-----
diff --git a/tests/data_files/ecdsa_secp384r1.crt b/tests/data_files/ecdsa_secp384r1.crt
new file mode 100644
index 0000000..ff986a7
--- /dev/null
+++ b/tests/data_files/ecdsa_secp384r1.crt
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBlzCCAR0CAU0wCgYIKoZIzj0EAwMwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEz
+MDAzMDgwMVoXDTMxMTIwMTAzMDgwMVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAATZxmK1C6KcpHmQRQ4EOur08MabFWdtES9iKnHJMFmvmZaRxWgNK0TREVed
+sS9KQTou1cRfz7Z7W2PgC5Hr5Z0JprGsLAxCgqoSMX7VkU+Zm8SIuxMug0LMNvLK
+XjN5x0cwCgYIKoZIzj0EAwMDaAAwZQIwNypsq0ahwMM7aFSS+RSTloH1D1+gIztz
+Yq54Reth6gdh1IO5R5aNZi/YP3uVcI1mAjEAisjjz7vCeKwor+HCq9cBc2rzIlkY
+5O6q4SCSgkqiCTnyFIqCassED9NPqho3KYM1
+-----END CERTIFICATE-----
diff --git a/tests/data_files/ecdsa_secp384r1_sha384.key b/tests/data_files/ecdsa_secp384r1.key
similarity index 100%
rename from tests/data_files/ecdsa_secp384r1_sha384.key
rename to tests/data_files/ecdsa_secp384r1.key
diff --git a/tests/data_files/ecdsa_secp384r1_sha384.crt b/tests/data_files/ecdsa_secp384r1_sha384.crt
deleted file mode 100644
index f118d93..0000000
--- a/tests/data_files/ecdsa_secp384r1_sha384.crt
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBljCCAR0CAU0wCgYIKoZIzj0EAwMwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEy
-MjAzMTQyOVoXDTMxMTEyMzAzMTQyOVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAATZxmK1C6KcpHmQRQ4EOur08MabFWdtES9iKnHJMFmvmZaRxWgNK0TREVed
-sS9KQTou1cRfz7Z7W2PgC5Hr5Z0JprGsLAxCgqoSMX7VkU+Zm8SIuxMug0LMNvLK
-XjN5x0cwCgYIKoZIzj0EAwMDZwAwZAIwXT9d8T51CEKEEmAoIM+C5hpUR2wZA0h4
-MhEBNztbMPZbmCDsYCMCSfPX8WZd0j0GAjAIc8t/78oYiB/JerLS6tft4QVi+x0x
-DeTGA3ubd7Jv4f8slit7DCGwjcvj1Gst8uE=
------END CERTIFICATE-----
diff --git a/tests/data_files/ecdsa_secp521r1.crt b/tests/data_files/ecdsa_secp521r1.crt
new file mode 100644
index 0000000..a08850c
--- /dev/null
+++ b/tests/data_files/ecdsa_secp521r1.crt
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvjCCAUMCAU0wCgYIKoZIzj0EAwMwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEz
+MDAzMDgwMVoXDTMxMTIwMTAzMDgwMVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
+CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwgZswEAYHKoZIzj0CAQYFK4EE
+ACMDgYYABAAd4ULVT2nrA47kt6+dPKB3Nv2c9xnrNU1ph57n88E2+w+/nwj4a+X6
+Eo7BoFHT5sZD6Fraj/rPNmPCYL0shEtvVgDO6OSKnmXQnK3YnyNd7gXzuKZGvnFf
+H2fVtDTg/yOh/Afvd0AZPkDu/287zf12WqkVUDNST+TyBfVETiksTC9qwTAKBggq
+hkjOPQQDAwNpADBmAjEAlC7039gDSgm9Ba8cCnZLWucXbtCbhRGSvVcoElYke/pu
+iwHkD1rVlnUmW3UKG587AjEAkIngapC9Hyc6MePmyafLYoLmbhDJMdR2DM4o+x8e
+2ZXUu7uLPTdWBDxmu6plRNis
+-----END CERTIFICATE-----
diff --git a/tests/data_files/ecdsa_secp521r1_sha512.key b/tests/data_files/ecdsa_secp521r1.key
similarity index 100%
rename from tests/data_files/ecdsa_secp521r1_sha512.key
rename to tests/data_files/ecdsa_secp521r1.key
diff --git a/tests/data_files/ecdsa_secp521r1_sha512.crt b/tests/data_files/ecdsa_secp521r1_sha512.crt
deleted file mode 100644
index 28b00e6..0000000
--- a/tests/data_files/ecdsa_secp521r1_sha512.crt
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBvDCCAUMCAU0wCgYIKoZIzj0EAwQwPjELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRwwGgYDVQQDDBNQb2xhcnNzbCBUZXN0IEVDIENBMB4XDTIxMTEy
-MjAzMTQyOVoXDTMxMTEyMzAzMTQyOVowNDELMAkGA1UEBhMCTkwxETAPBgNVBAoM
-CFBvbGFyU1NMMRIwEAYDVQQDDAlsb2NhbGhvc3QwgZswEAYHKoZIzj0CAQYFK4EE
-ACMDgYYABAAd4ULVT2nrA47kt6+dPKB3Nv2c9xnrNU1ph57n88E2+w+/nwj4a+X6
-Eo7BoFHT5sZD6Fraj/rPNmPCYL0shEtvVgDO6OSKnmXQnK3YnyNd7gXzuKZGvnFf
-H2fVtDTg/yOh/Afvd0AZPkDu/287zf12WqkVUDNST+TyBfVETiksTC9qwTAKBggq
-hkjOPQQDBANnADBkAjAxYbmIs+xKIvDgqE7uNOgqfVk4iEF9w5B4DQDXb7kbu4rg
-4QvqPhyBhptFiJabe9kCMFF1FKuHSQoMmZ1/yjBZg8r4/P8xKSY8W9ujHdam3jWK
-b8Ygw4ENklSl1cuHMLupMw==
------END CERTIFICATE-----