diff --git a/security/manager/ssl/tests/unit/test_keysize.js b/security/manager/ssl/tests/unit/test_keysize.js index bca1437c91d2..3a8e28e87deb 100644 --- a/security/manager/ssl/tests/unit/test_keysize.js +++ b/security/manager/ssl/tests/unit/test_keysize.js @@ -77,44 +77,44 @@ function checkRSAChains(inadequateKeySize, adequateKeySize) { } 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); } diff --git 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_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec deleted file mode 100644 index 3069af41c11a..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_secp224r1_224 -subject:ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224 -issuerKey:secp256r1 -subjectKey:secp256r1 -signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec deleted file mode 100644 index d9c61b4151e0..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_secp256k1_256 -subject:ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256 -issuerKey:secp256r1 -subjectKey:secp256r1 -signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec deleted file mode 100644 index 6594c77e7044..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec +++ /dev/null @@ -1,4 +0,0 @@ -issuer:int_rsa_1016-root_prime256v1_256 -subject:ee_prime256v1_256-int_rsa_1016-root_prime256v1_256 -issuerKey:rsa1016 -subjectKey:secp256r1 diff --git 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_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec deleted file mode 100644 index 407f69bcf328..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_secp224r1_224-root_prime256v1_256 -subject:ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256 -issuerKey:secp224r1 -subjectKey:secp256r1 -signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-root_prime256v1_256.pem.certspec deleted file mode 100644 index c86062aa6a53..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_prime256v1_256 -subject:ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256 -issuerKey:secp256r1 -subjectKey:secp224r1 -signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-root_rsa_2048.pem.certspec deleted file mode 100644 index 0105c7ca8371..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_rsa_2048 -subject:ee_secp224r1_224-int_prime256v1_256-root_rsa_2048 -issuerKey:secp256r1 -subjectKey:secp224r1 -signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_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 new file mode 100644 index 000000000000..87d2f67339ff --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_rsa_2048 +subject:ee_secp224r1_224-int_secp256r1_256-root_rsa_2048 +issuerKey:secp256r1 +subjectKey:secp224r1 +signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec b/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec new file mode 100644 index 000000000000..1aadce0765c4 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_secp256r1_256 +subject:ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256 +issuerKey:secp256r1 +subjectKey:secp224r1 +signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-root_prime256v1_256.pem.certspec deleted file mode 100644 index b9325fb6988a..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_prime256v1_256 -subject:ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256 -issuerKey:secp256r1 -subjectKey:secp256k1 -signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec b/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec new file mode 100644 index 000000000000..ba999e8f1462 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_secp256r1_256 +subject:ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256 +issuerKey:secp256r1 +subjectKey:secp256k1 +signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec new file mode 100644 index 000000000000..1e2e0a375921 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec @@ -0,0 +1,4 @@ +issuer:int_rsa_1016-root_secp256r1_256 +subject:ee_secp256r1_256-int_rsa_1016-root_secp256r1_256 +issuerKey:rsa1016 +subjectKey:secp256r1 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec new file mode 100644 index 000000000000..bd7bc770c7bb --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp224r1_224-root_secp256r1_256 +subject:ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256 +issuerKey:secp224r1 +subjectKey:secp256r1 +signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_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 new file mode 100644 index 000000000000..fe7b7f7482eb --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_secp224r1_224 +subject:ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224 +issuerKey:secp256r1 +subjectKey:secp256r1 +signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_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 new file mode 100644 index 000000000000..aefffd98104d --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_secp256k1_256 +subject:ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256 +issuerKey:secp256r1 +subjectKey:secp256r1 +signature:ecdsaWithSHA256 diff --git 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_prime256v1_256-root_rsa_2048.pem.certspec deleted file mode 100644 index b8e8379f8f74..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_prime256v1_256-root_rsa_2048 -subject:ee_secp384r1_384-int_prime256v1_256-root_rsa_2048 -issuerKey:secp256r1 -subjectKey:secp384r1 -signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_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 new file mode 100644 index 000000000000..615818d08be0 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp256r1_256-root_rsa_2048 +subject:ee_secp384r1_384-int_secp256r1_256-root_rsa_2048 +issuerKey:secp256r1 +subjectKey:secp384r1 +signature:ecdsaWithSHA256 diff --git 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_prime256v1_256.pem.certspec deleted file mode 100644 index bcdcf5b3000a..000000000000 --- a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem.certspec +++ /dev/null @@ -1,5 +0,0 @@ -issuer:int_secp384r1_384-root_prime256v1_256 -subject:ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256 -issuerKey:secp384r1 -subjectKey:secp521r1 -signature:ecdsaWithSHA256 diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec b/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec new file mode 100644 index 000000000000..b2ae9d0c8f10 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec @@ -0,0 +1,5 @@ +issuer:int_secp384r1_384-root_secp256r1_256 +subject:ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256 +issuerKey:secp384r1 +subjectKey:secp521r1 +signature:ecdsaWithSHA256 diff --git 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 similarity index 66% 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 index 1b15d427ac3b..27728ca374e8 100644 --- 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,5 +1,5 @@ -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 diff --git 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 similarity index 65% 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 index 3e4d288fc3c3..89d77d3b892a 100644 --- 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,5 +1,5 @@ -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 diff --git 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 similarity index 73% 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 index e647e821721e..44a65ef5a788 100644 --- 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 diff --git 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 similarity index 77% 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 index eace082db571..66ebc1b93e37 100644 --- 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,5 +1,5 @@ issuer:root_secp224r1_224 -subject:int_prime256v1_256-root_secp224r1_224 +subject:int_secp256r1_256-root_secp224r1_224 issuerKey:secp224r1 subjectKey:secp256r1 signature:ecdsaWithSHA256 diff --git 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 similarity index 77% 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 index d38206da371c..c7e190ab0be0 100644 --- 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,5 +1,5 @@ issuer:root_secp256k1_256 -subject:int_prime256v1_256-root_secp256k1_256 +subject:int_secp256r1_256-root_secp256k1_256 issuerKey:secp256k1 subjectKey:secp256r1 signature:ecdsaWithSHA256 diff --git 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 similarity index 64% 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 index f2f1857b6096..6854d2187644 100644 --- 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,5 +1,5 @@ -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 diff --git 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 similarity index 65% 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 index f6b5c7b9ea13..de8e8519819f 100644 --- 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,5 +1,5 @@ -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 diff --git a/security/manager/ssl/tests/unit/test_keysize/moz.build b/security/manager/ssl/tests/unit/test_keysize/moz.build index 2f5bbec11fb1..40226ee519d5 100644 --- a/security/manager/ssl/tests/unit/test_keysize/moz.build +++ b/security/manager/ssl/tests/unit/test_keysize/moz.build @@ -5,35 +5,35 @@ # 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: diff --git 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 similarity index 71% 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 index 65ad81248288..4447fc4b476a 100644 --- 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,5 +1,5 @@ -issuer:root_prime256v1_256 -subject:root_prime256v1_256 +issuer:root_secp256r1_256 +subject:root_secp256r1_256 issuerKey:secp256r1 subjectKey:secp256r1 signature:ecdsaWithSHA256