Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1190603 - rename prime256v1 to secp256r1 in test_keysize.js to reduce confusion r=Cykesiopka

Browse Source 
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.

--HG--
rename : 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
rename : 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_secp256r1_256-root_secp256r1_256.pem.certspec
rename : 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
rename : 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_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
rename : 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_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
rename : 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_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
rename : 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_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
rename : 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
rename : 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
rename : 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
rename : 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
rename : security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_rsa_2048.pem.certspec => security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
rename : security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp224r1_224.pem.certspec => security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
rename : security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp256k1_256.pem.certspec => security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
rename : security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_prime256v1_256.pem.certspec => security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
rename : 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
rename : security/manager/ssl/tests/unit/test_keysize/root_prime256v1_256.pem.certspec => security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
This commit is contained in:
David Keeler 2015-08-05 13:39:11 -07:00
parent 70897766ec
commit 23a9820f27
28 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
security/manager/ssl/tests/unit/test_keysize.js
View File

@ -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);
}

5
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp224r1_224.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_prime256v1_256-root_secp256k1_256.pem.certspec
View File

@ -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

4
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_rsa_1016-root_prime256v1_256.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_prime256v1_256-int_secp224r1_224-root_prime256v1_256.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_prime256v1_256.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_prime256v1_256-root_rsa_2048.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_prime256v1_256-root_prime256v1_256.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec Normal file
View File

@ -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

4
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_prime256v1_256-root_rsa_2048.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec Normal file
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_prime256v1_256.pem.certspec
View File

@ -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

5
security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec Normal file
View File

@ -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

4
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
View File

@ -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

4
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
View File

@ -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

2
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_rsa_2048.pem.certspec → security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
View File

@ -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

2
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp224r1_224.pem.certspec → security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
View File

@ -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

2
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_secp256k1_256.pem.certspec → security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
View File

@ -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

4
security/manager/ssl/tests/unit/test_keysize/int_prime256v1_256-root_prime256v1_256.pem.certspec → security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
View File

@ -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

4
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
View File

@ -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

34
security/manager/ssl/tests/unit/test_keysize/moz.build
View File

@ -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:

4
security/manager/ssl/tests/unit/test_keysize/root_prime256v1_256.pem.certspec → security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
View File

@ -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