bug 1190603 - rename prime256v1 to secp256r1 in test_keysize.js to reduce confusion r=Cykesiopka
authorDavid Keeler <dkeeler@mozilla.com>
Wed, 05 Aug 2015 13:39:11 -0700
changeset 258055 3804f6a42fb578c122b0f36419b3ae3152ec1d85
parent 258054 6360708999c9e42e77bae241f5a65b0784b30d55
child 258056 0b962c67da9c4cecd5fa52adc4b9250b162551b3
push idunknown
push userunknown
push dateunknown
reviewersCykesiopka
bugs1190603
milestone43.0a1
bug 1190603 - rename prime256v1 to secp256r1 in test_keysize.js to reduce confusion r=Cykesiopka OpenSSL refers to the curve in question as 'prime256v1', but rfc 5480, mozilla::pkix, and the test framework refer to it as secp256r1, so we should be consistent.
security/manager/ssl/tests/unit/test_keysize.js
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp224r1_224.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp256k1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/moz.build
security/manager/ssl/tests/unit/test_keysize/root_prime256v1_256.pem.certspec
security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize.js
+++ b/security/manager/ssl/tests/unit/test_keysize.js
@@ -72,54 +72,54 @@ function checkRSAChains(inadequateKeySiz
   // Chain with an end entity cert that has an inadequate size for DV
   checkChain("rsa", adequateKeySize,
              "rsa", adequateKeySize,
              "rsa", inadequateKeySize,
              MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE);
 }
 
 function checkECCChains() {
-  checkChain("prime256v1", 256,
+  checkChain("secp256r1", 256,
              "secp384r1", 384,
              "secp521r1", 521,
              PRErrorCodeSuccess);
-  checkChain("prime256v1", 256,
+  checkChain("secp256r1", 256,
              "secp224r1", 224,
-             "prime256v1", 256,
+             "secp256r1", 256,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
-  checkChain("prime256v1", 256,
-             "prime256v1", 256,
+  checkChain("secp256r1", 256,
+             "secp256r1", 256,
              "secp224r1", 224,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
   checkChain("secp224r1", 224,
-             "prime256v1", 256,
-             "prime256v1", 256,
+             "secp256r1", 256,
+             "secp256r1", 256,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
-  checkChain("prime256v1", 256,
-             "prime256v1", 256,
+  checkChain("secp256r1", 256,
+             "secp256r1", 256,
              "secp256k1", 256,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
   checkChain("secp256k1", 256,
-             "prime256v1", 256,
-             "prime256v1", 256,
+             "secp256r1", 256,
+             "secp256r1", 256,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
 }
 
 function checkCombinationChains() {
   checkChain("rsa", 2048,
-             "prime256v1", 256,
+             "secp256r1", 256,
              "secp384r1", 384,
              PRErrorCodeSuccess);
   checkChain("rsa", 2048,
-             "prime256v1", 256,
+             "secp256r1", 256,
              "secp224r1", 224,
              SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
-  checkChain("prime256v1", 256,
+  checkChain("secp256r1", 256,
              "rsa", 1016,
-             "prime256v1", 256,
+             "secp256r1", 256,
              MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE);
 }
 
 function run_test() {
   checkRSAChains(1016, 1024);
   checkECCChains();
   checkCombinationChains();
 
rename from security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_rsa_2048
-subject:ee_secp224r1_224-int_prime256v1_256-root_rsa_2048
+issuer:int_secp256r1_256-root_rsa_2048
+subject:ee_secp224r1_224-int_secp256r1_256-root_rsa_2048
 issuerKey:secp256r1
 subjectKey:secp224r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_prime256v1_256
-subject:ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256
+issuer:int_secp256r1_256-root_secp256r1_256
+subject:ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp224r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_prime256v1_256
-subject:ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256
+issuer:int_secp256r1_256-root_secp256r1_256
+subject:ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp256k1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
@@ -1,4 +1,4 @@
-issuer:int_rsa_1016-root_prime256v1_256
-subject:ee_prime256v1_256-int_rsa_1016-root_prime256v1_256
+issuer:int_rsa_1016-root_secp256r1_256
+subject:ee_secp256r1_256-int_rsa_1016-root_secp256r1_256
 issuerKey:rsa1016
 subjectKey:secp256r1
rename from security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_secp224r1_224-root_prime256v1_256
-subject:ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256
+issuer:int_secp224r1_224-root_secp256r1_256
+subject:ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256
 issuerKey:secp224r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_secp224r1_224
-subject:ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224
+issuer:int_secp256r1_256-root_secp224r1_224
+subject:ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224
 issuerKey:secp256r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_secp256k1_256
-subject:ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256
+issuer:int_secp256r1_256-root_secp256k1_256
+subject:ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256
 issuerKey:secp256r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_prime256v1_256-root_rsa_2048
-subject:ee_secp384r1_384-int_prime256v1_256-root_rsa_2048
+issuer:int_secp256r1_256-root_rsa_2048
+subject:ee_secp384r1_384-int_secp256r1_256-root_rsa_2048
 issuerKey:secp256r1
 subjectKey:secp384r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
@@ -1,5 +1,5 @@
-issuer:int_secp384r1_384-root_prime256v1_256
-subject:ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256
+issuer:int_secp384r1_384-root_secp256r1_256
+subject:ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256
 issuerKey:secp384r1
 subjectKey:secp521r1
 signature:ecdsaWithSHA256
rename from security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
@@ -1,7 +1,7 @@
-issuer:root_prime256v1_256
-subject:int_rsa_1016-root_prime256v1_256
+issuer:root_secp256r1_256
+subject:int_rsa_1016-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:rsa1016
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
@@ -1,7 +1,7 @@
-issuer:root_prime256v1_256
-subject:int_secp224r1_224-root_prime256v1_256
+issuer:root_secp256r1_256
+subject:int_secp224r1_224-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp224r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_rsa_2048.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_rsa_2048.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
@@ -1,5 +1,5 @@
 issuer:root_rsa_2048
-subject:int_prime256v1_256-root_rsa_2048
+subject:int_secp256r1_256-root_rsa_2048
 subjectKey:secp256r1
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp224r1_224.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp224r1_224.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
@@ -1,7 +1,7 @@
 issuer:root_secp224r1_224
-subject:int_prime256v1_256-root_secp224r1_224
+subject:int_secp256r1_256-root_secp224r1_224
 issuerKey:secp224r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp256k1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp256k1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
@@ -1,7 +1,7 @@
 issuer:root_secp256k1_256
-subject:int_prime256v1_256-root_secp256k1_256
+subject:int_secp256r1_256-root_secp256k1_256
 issuerKey:secp256k1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
@@ -1,7 +1,7 @@
-issuer:root_prime256v1_256
-subject:int_prime256v1_256-root_prime256v1_256
+issuer:root_secp256r1_256
+subject:int_secp256r1_256-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
rename from security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
@@ -1,7 +1,7 @@
-issuer:root_prime256v1_256
-subject:int_secp384r1_384-root_prime256v1_256
+issuer:root_secp256r1_256
+subject:int_secp384r1_384-root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp384r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign
--- a/security/manager/ssl/tests/unit/test_keysize/moz.build
+++ b/security/manager/ssl/tests/unit/test_keysize/moz.build
@@ -1,44 +1,44 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 test_certificates = (
-    'ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem',
-    'ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem',
-    'ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem',
-    'ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem',
     'ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem',
     'ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem',
     'ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem',
     'ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem',
-    'ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem',
-    'ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem',
-    'ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem',
-    'ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem',
-    'ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem',
-    'int_prime256v1_256-root_prime256v1_256.pem',
-    'int_prime256v1_256-root_rsa_2048.pem',
-    'int_prime256v1_256-root_secp224r1_224.pem',
-    'int_prime256v1_256-root_secp256k1_256.pem',
-    'int_rsa_1016-root_prime256v1_256.pem',
+    'ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem',
+    'ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem',
+    'ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem',
+    'ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem',
+    'ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem',
+    'ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem',
+    'ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem',
+    'ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem',
+    'ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem',
     'int_rsa_1016-root_rsa_1024.pem',
+    'int_rsa_1016-root_secp256r1_256.pem',
     'int_rsa_1024-root_rsa_1016.pem',
     'int_rsa_1024-root_rsa_1024.pem',
-    'int_secp224r1_224-root_prime256v1_256.pem',
-    'int_secp384r1_384-root_prime256v1_256.pem',
-    'root_prime256v1_256.pem',
+    'int_secp224r1_224-root_secp256r1_256.pem',
+    'int_secp256r1_256-root_rsa_2048.pem',
+    'int_secp256r1_256-root_secp224r1_224.pem',
+    'int_secp256r1_256-root_secp256k1_256.pem',
+    'int_secp256r1_256-root_secp256r1_256.pem',
+    'int_secp384r1_384-root_secp256r1_256.pem',
     'root_rsa_1016.pem',
     'root_rsa_1024.pem',
     'root_rsa_2048.pem',
     'root_secp224r1_224.pem',
     'root_secp256k1_256.pem',
+    'root_secp256r1_256.pem',
 )
 
 for test_certificate in test_certificates:
     input_file = test_certificate + '.certspec'
     GENERATED_FILES += [test_certificate]
     props = GENERATED_FILES[test_certificate]
     props.script = '../pycert.py'
     props.inputs = [input_file]
rename from security/manager/ssl/tests/unit/test_keysize/root_prime256v1_256.pem.certspec
rename to security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
--- a/security/manager/ssl/tests/unit/test_keysize/root_prime256v1_256.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
@@ -1,7 +1,7 @@
-issuer:root_prime256v1_256
-subject:root_prime256v1_256
+issuer:root_secp256r1_256
+subject:root_secp256r1_256
 issuerKey:secp256r1
 subjectKey:secp256r1
 signature:ecdsaWithSHA256
 extension:basicConstraints:cA,
 extension:keyUsage:cRLSign,keyCertSign