Created
April 15, 2020 20:14
-
-
Save mozkeeler/804897d26afa452caa70539b454d45ea to your computer and use it in GitHub Desktop.
re-enable-certificate-and-key-generation.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/netwerk/test/unit/moz.build b/netwerk/test/unit/moz.build | |
| --- a/netwerk/test/unit/moz.build | |
| +++ b/netwerk/test/unit/moz.build | |
| @@ -5,4 +5,4 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#GeneratedTestCertificate('http2-ca.pem') | |
| +GeneratedTestCertificate('http2-ca.pem') | |
| diff --git a/security/manager/ssl/tests/mochitest/browser/moz.build b/security/manager/ssl/tests/mochitest/browser/moz.build | |
| --- a/security/manager/ssl/tests/mochitest/browser/moz.build | |
| +++ b/security/manager/ssl/tests/mochitest/browser/moz.build | |
| @@ -11,30 +11,30 @@ BROWSER_CHROME_MANIFESTS += ['browser.in | |
| # that the mochitest harness knows where to get the generated certificates - | |
| # right now it assumes they're in the source directory, which isn't the case | |
| # when they're automatically generated.) | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'client-cert-via-intermediate.pem', | |
| -# 'code-ee.pem', | |
| -# 'ee-from-expired-ca.pem', | |
| -# 'ee-from-untrusted-ca.pem', | |
| -# 'email-ee.pem', | |
| -# 'expired-ca.pem', | |
| -# 'has-cn.pem', | |
| -# 'has-empty-subject.pem', | |
| -# 'has-non-empty-subject.pem', | |
| -# 'has-o.pem', | |
| -# 'has-ou.pem', | |
| -# 'intermediate.pem', | |
| -# 'invalid.pem', | |
| -# 'longOID.pem', | |
| -# 'md5-ee.pem', | |
| -# 'pgo-ca-all-usages.pem', | |
| -# 'pgo-ca-regular-usages.pem', | |
| -# 'revoked.pem', | |
| -# 'ssl-ee.pem', | |
| -# 'unknown-issuer.pem', | |
| -# 'untrusted-ca.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'client-cert-via-intermediate.pem', | |
| + 'code-ee.pem', | |
| + 'ee-from-expired-ca.pem', | |
| + 'ee-from-untrusted-ca.pem', | |
| + 'email-ee.pem', | |
| + 'expired-ca.pem', | |
| + 'has-cn.pem', | |
| + 'has-empty-subject.pem', | |
| + 'has-non-empty-subject.pem', | |
| + 'has-o.pem', | |
| + 'has-ou.pem', | |
| + 'intermediate.pem', | |
| + 'invalid.pem', | |
| + 'longOID.pem', | |
| + 'md5-ee.pem', | |
| + 'pgo-ca-all-usages.pem', | |
| + 'pgo-ca-regular-usages.pem', | |
| + 'revoked.pem', | |
| + 'ssl-ee.pem', | |
| + 'unknown-issuer.pem', | |
| + 'untrusted-ca.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/bad_certs/moz.build b/security/manager/ssl/tests/unit/bad_certs/moz.build | |
| --- a/security/manager/ssl/tests/unit/bad_certs/moz.build | |
| +++ b/security/manager/ssl/tests/unit/bad_certs/moz.build | |
| @@ -5,67 +5,67 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'badSubjectAltNames.pem', | |
| -# 'beforeEpoch.pem', | |
| -# 'beforeEpochINT.pem', | |
| -# 'beforeEpochIssuer.pem', | |
| -# 'ca-used-as-end-entity.pem', | |
| -# 'default-ee.pem', | |
| -# 'ee-from-missing-intermediate.pem', | |
| -# 'ee-imminently-distrusted.pem', | |
| -# 'eeIssuedByNonCA.pem', | |
| -# 'eeIssuedByV1Cert.pem', | |
| -# 'emptyIssuerName.pem', | |
| -# 'emptyNameCA.pem', | |
| -# 'ev-test-intermediate.pem', | |
| -# 'ev-test.pem', | |
| -# 'evroot.pem', | |
| -# 'expired-ee.pem', | |
| -# 'expiredINT.pem', | |
| -# 'expiredissuer.pem', | |
| -# 'idn-certificate.pem', | |
| -# 'inadequateKeySizeEE.pem', | |
| -# 'inadequatekeyusage-ee.pem', | |
| -# 'ipAddressAsDNSNameInSAN.pem', | |
| -# 'md5signature-expired.pem', | |
| -# 'md5signature.pem', | |
| -# 'mismatch-expired.pem', | |
| -# 'mismatch-notYetValid.pem', | |
| -# 'mismatch-untrusted-expired.pem', | |
| -# 'mismatch-untrusted.pem', | |
| -# 'mismatch.pem', | |
| -# 'mismatchCN.pem', | |
| -# 'mitm.pem', | |
| -# 'noValidNames.pem', | |
| -# 'notYetValid.pem', | |
| -# 'notYetValidINT.pem', | |
| -# 'notYetValidIssuer.pem', | |
| -# 'nsCertTypeCritical.pem', | |
| -# 'nsCertTypeCriticalWithExtKeyUsage.pem', | |
| -# 'nsCertTypeNotCritical.pem', | |
| -# 'other-issuer-ee.pem', | |
| -# 'other-test-ca.pem', | |
| -# 'self-signed-EE-with-cA-true.pem', | |
| -# 'selfsigned-inadequateEKU.pem', | |
| -# 'selfsigned.pem', | |
| -# 'test-ca.pem', | |
| -# 'test-int.pem', | |
| -# 'unknownissuer.pem', | |
| -# 'untrusted-expired.pem', | |
| -# 'untrustedissuer.pem', | |
| -# 'v1Cert.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'default-ee.key', | |
| -# 'evroot.key', | |
| -# 'inadequateKeySizeEE.key', | |
| -# 'other-test-ca.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'badSubjectAltNames.pem', | |
| + 'beforeEpoch.pem', | |
| + 'beforeEpochINT.pem', | |
| + 'beforeEpochIssuer.pem', | |
| + 'ca-used-as-end-entity.pem', | |
| + 'default-ee.pem', | |
| + 'ee-from-missing-intermediate.pem', | |
| + 'ee-imminently-distrusted.pem', | |
| + 'eeIssuedByNonCA.pem', | |
| + 'eeIssuedByV1Cert.pem', | |
| + 'emptyIssuerName.pem', | |
| + 'emptyNameCA.pem', | |
| + 'ev-test-intermediate.pem', | |
| + 'ev-test.pem', | |
| + 'evroot.pem', | |
| + 'expired-ee.pem', | |
| + 'expiredINT.pem', | |
| + 'expiredissuer.pem', | |
| + 'idn-certificate.pem', | |
| + 'inadequateKeySizeEE.pem', | |
| + 'inadequatekeyusage-ee.pem', | |
| + 'ipAddressAsDNSNameInSAN.pem', | |
| + 'md5signature-expired.pem', | |
| + 'md5signature.pem', | |
| + 'mismatch-expired.pem', | |
| + 'mismatch-notYetValid.pem', | |
| + 'mismatch-untrusted-expired.pem', | |
| + 'mismatch-untrusted.pem', | |
| + 'mismatch.pem', | |
| + 'mismatchCN.pem', | |
| + 'mitm.pem', | |
| + 'noValidNames.pem', | |
| + 'notYetValid.pem', | |
| + 'notYetValidINT.pem', | |
| + 'notYetValidIssuer.pem', | |
| + 'nsCertTypeCritical.pem', | |
| + 'nsCertTypeCriticalWithExtKeyUsage.pem', | |
| + 'nsCertTypeNotCritical.pem', | |
| + 'other-issuer-ee.pem', | |
| + 'other-test-ca.pem', | |
| + 'self-signed-EE-with-cA-true.pem', | |
| + 'selfsigned-inadequateEKU.pem', | |
| + 'selfsigned.pem', | |
| + 'test-ca.pem', | |
| + 'test-int.pem', | |
| + 'unknownissuer.pem', | |
| + 'untrusted-expired.pem', | |
| + 'untrustedissuer.pem', | |
| + 'v1Cert.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'default-ee.key', | |
| + 'evroot.key', | |
| + 'inadequateKeySizeEE.key', | |
| + 'other-test-ca.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/ocsp_certs/moz.build b/security/manager/ssl/tests/unit/ocsp_certs/moz.build | |
| --- a/security/manager/ssl/tests/unit/ocsp_certs/moz.build | |
| +++ b/security/manager/ssl/tests/unit/ocsp_certs/moz.build | |
| @@ -5,38 +5,38 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca-used-as-end-entity.pem', | |
| -# 'default-ee.pem', | |
| -# 'delegatedSHA1Signer.pem', | |
| -# 'delegatedSigner.pem', | |
| -# 'invalidDelegatedSignerFromIntermediate.pem', | |
| -# 'invalidDelegatedSignerKeyUsageCrlSigning.pem', | |
| -# 'invalidDelegatedSignerNoExtKeyUsage.pem', | |
| -# 'invalidDelegatedSignerWrongExtKeyUsage.pem', | |
| -# 'multi-tls-feature-bad-ee.pem', | |
| -# 'multi-tls-feature-good-ee.pem', | |
| -# 'must-staple-ee.pem', | |
| -# 'must-staple-ee-with-must-staple-int.pem', | |
| -# 'must-staple-missing-ee.pem', | |
| -# 'ocspEEWithIntermediate.pem', | |
| -# 'ocspOtherEndEntity.pem', | |
| -# 'other-test-ca.pem', | |
| -# 'rsa-1016-keysizeDelegatedSigner.pem', | |
| -# 'test-ca.pem', | |
| -# 'test-int.pem', | |
| -# 'test-multi-tls-feature-int.pem', | |
| -# 'test-must-staple-int.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'default-ee.key', | |
| -# 'other-test-ca.key', | |
| -# 'rsa-1016-keysizeDelegatedSigner.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'ca-used-as-end-entity.pem', | |
| + 'default-ee.pem', | |
| + 'delegatedSHA1Signer.pem', | |
| + 'delegatedSigner.pem', | |
| + 'invalidDelegatedSignerFromIntermediate.pem', | |
| + 'invalidDelegatedSignerKeyUsageCrlSigning.pem', | |
| + 'invalidDelegatedSignerNoExtKeyUsage.pem', | |
| + 'invalidDelegatedSignerWrongExtKeyUsage.pem', | |
| + 'multi-tls-feature-bad-ee.pem', | |
| + 'multi-tls-feature-good-ee.pem', | |
| + 'must-staple-ee.pem', | |
| + 'must-staple-ee-with-must-staple-int.pem', | |
| + 'must-staple-missing-ee.pem', | |
| + 'ocspEEWithIntermediate.pem', | |
| + 'ocspOtherEndEntity.pem', | |
| + 'other-test-ca.pem', | |
| + 'rsa-1016-keysizeDelegatedSigner.pem', | |
| + 'test-ca.pem', | |
| + 'test-int.pem', | |
| + 'test-multi-tls-feature-int.pem', | |
| + 'test-must-staple-int.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'default-ee.key', | |
| + 'other-test-ca.key', | |
| + 'rsa-1016-keysizeDelegatedSigner.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build b/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build | |
| @@ -5,15 +5,15 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'no-san-old.pem', | |
| -# 'no-san-older.pem', | |
| -# 'no-san-recent.pem', | |
| -# 'san-contains-no-hostnames-old.pem', | |
| -# 'san-contains-no-hostnames-older.pem', | |
| -# 'san-contains-no-hostnames-recent.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'no-san-old.pem', | |
| + 'no-san-older.pem', | |
| + 'no-san-recent.pem', | |
| + 'san-contains-no-hostnames-old.pem', | |
| + 'san-contains-no-hostnames-older.pem', | |
| + 'san-contains-no-hostnames-recent.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_eku/moz.build b/security/manager/ssl/tests/unit/test_cert_eku/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_eku/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_eku/moz.build | |
| @@ -5,31 +5,31 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'ee-CA.pem', | |
| -# 'ee-SA-CA.pem', | |
| -# 'ee-SA-OCSP.pem', | |
| -# 'ee-SA-nsSGC.pem', | |
| -# 'ee-SA.pem', | |
| -# 'ee-int-CA.pem', | |
| -# 'ee-int-SA-CA.pem', | |
| -# 'ee-int-SA-OCSP.pem', | |
| -# 'ee-int-SA-nsSGC.pem', | |
| -# 'ee-int-SA.pem', | |
| -# 'ee-int-nsSGC-old.pem', | |
| -# 'ee-int-nsSGC-older.pem', | |
| -# 'ee-int-nsSGC-recent.pem', | |
| -# 'ee-nsSGC.pem', | |
| -# 'int-CA.pem', | |
| -# 'int-SA-CA.pem', | |
| -# 'int-SA-OCSP.pem', | |
| -# 'int-SA-nsSGC.pem', | |
| -# 'int-SA.pem', | |
| -# 'int-nsSGC-old.pem', | |
| -# 'int-nsSGC-older.pem', | |
| -# 'int-nsSGC-recent.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'ee-CA.pem', | |
| + 'ee-SA-CA.pem', | |
| + 'ee-SA-OCSP.pem', | |
| + 'ee-SA-nsSGC.pem', | |
| + 'ee-SA.pem', | |
| + 'ee-int-CA.pem', | |
| + 'ee-int-SA-CA.pem', | |
| + 'ee-int-SA-OCSP.pem', | |
| + 'ee-int-SA-nsSGC.pem', | |
| + 'ee-int-SA.pem', | |
| + 'ee-int-nsSGC-old.pem', | |
| + 'ee-int-nsSGC-older.pem', | |
| + 'ee-int-nsSGC-recent.pem', | |
| + 'ee-nsSGC.pem', | |
| + 'int-CA.pem', | |
| + 'int-SA-CA.pem', | |
| + 'int-SA-OCSP.pem', | |
| + 'int-SA-nsSGC.pem', | |
| + 'int-SA.pem', | |
| + 'int-nsSGC-old.pem', | |
| + 'int-nsSGC-older.pem', | |
| + 'int-nsSGC-recent.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build b/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build | |
| @@ -5,13 +5,13 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'embeddedNull.pem', | |
| -# 'embeddedNullCNAndSAN.pem', | |
| -# 'embeddedNullSAN.pem', | |
| -# 'embeddedNullSAN2.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'embeddedNull.pem', | |
| + 'embeddedNullCNAndSAN.pem', | |
| + 'embeddedNullSAN.pem', | |
| + 'embeddedNullSAN2.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build b/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build | |
| @@ -5,23 +5,23 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca-all-usages.pem', | |
| -# 'ca-missing-keyCertSign.pem', | |
| -# 'ca-no-keyUsage-extension.pem', | |
| -# 'ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem', | |
| -# 'ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem', | |
| -# 'ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem', | |
| -# 'ee-keyCertSign-only-ca-all-usages.pem', | |
| -# 'ee-keyCertSign-only-ca-missing-keyCertSign.pem', | |
| -# 'ee-keyCertSign-only-ca-no-keyUsage-extension.pem', | |
| -# 'ee-keyEncipherment-only-ca-all-usages.pem', | |
| -# 'ee-keyEncipherment-only-ca-missing-keyCertSign.pem', | |
| -# 'ee-keyEncipherment-only-ca-no-keyUsage-extension.pem', | |
| -# 'ee-no-keyUsage-extension-ca-all-usages.pem', | |
| -# 'ee-no-keyUsage-extension-ca-missing-keyCertSign.pem', | |
| -# 'ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca-all-usages.pem', | |
| + 'ca-missing-keyCertSign.pem', | |
| + 'ca-no-keyUsage-extension.pem', | |
| + 'ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem', | |
| + 'ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem', | |
| + 'ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem', | |
| + 'ee-keyCertSign-only-ca-all-usages.pem', | |
| + 'ee-keyCertSign-only-ca-missing-keyCertSign.pem', | |
| + 'ee-keyCertSign-only-ca-no-keyUsage-extension.pem', | |
| + 'ee-keyEncipherment-only-ca-all-usages.pem', | |
| + 'ee-keyEncipherment-only-ca-missing-keyCertSign.pem', | |
| + 'ee-keyEncipherment-only-ca-no-keyUsage-extension.pem', | |
| + 'ee-no-keyUsage-extension-ca-all-usages.pem', | |
| + 'ee-no-keyUsage-extension-ca-missing-keyCertSign.pem', | |
| + 'ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/moz.build b/security/manager/ssl/tests/unit/test_cert_sha1/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_sha1/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_sha1/moz.build | |
| @@ -5,14 +5,14 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'int-pre.pem', | |
| -# 'ee-pre_int-pre.pem', | |
| -# 'ee-post_int-pre.pem', | |
| -# 'int-post.pem', | |
| -# 'ee-post_int-post.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'int-pre.pem', | |
| + 'ee-pre_int-pre.pem', | |
| + 'ee-post_int-pre.pem', | |
| + 'int-post.pem', | |
| + 'ee-post_int-post.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/moz.build b/security/manager/ssl/tests/unit/test_cert_signatures/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_signatures/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_signatures/moz.build | |
| @@ -5,16 +5,16 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca-rsa.pem', | |
| -# 'ca-secp384r1.pem', | |
| -# 'ee-rsa-direct.pem', | |
| -# 'ee-rsa.pem', | |
| -# 'ee-secp384r1-direct.pem', | |
| -# 'ee-secp384r1.pem', | |
| -# 'int-rsa.pem', | |
| -# 'int-secp384r1.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca-rsa.pem', | |
| + 'ca-secp384r1.pem', | |
| + 'ee-rsa-direct.pem', | |
| + 'ee-rsa.pem', | |
| + 'ee-secp384r1-direct.pem', | |
| + 'ee-secp384r1.pem', | |
| + 'int-rsa.pem', | |
| + 'int-secp384r1.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_trust/moz.build b/security/manager/ssl/tests/unit/test_cert_trust/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_trust/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_trust/moz.build | |
| @@ -5,11 +5,11 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'ee.pem', | |
| -# 'int.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'ee.pem', | |
| + 'int.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_utf8/moz.build b/security/manager/ssl/tests/unit/test_cert_utf8/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_utf8/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_utf8/moz.build | |
| @@ -5,9 +5,9 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'certificateToAlter.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'certificateToAlter.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_cert_version/moz.build b/security/manager/ssl/tests/unit/test_cert_version/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_cert_version/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_cert_version/moz.build | |
| @@ -5,57 +5,57 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'ee_int-v1-BC-cA.pem', | |
| -# 'ee_int-v1-BC-not-cA.pem', | |
| -# 'ee_int-v1-noBC.pem', | |
| -# 'ee_int-v2-BC-cA.pem', | |
| -# 'ee_int-v2-BC-not-cA.pem', | |
| -# 'ee_int-v2-noBC.pem', | |
| -# 'ee_int-v3-BC-cA.pem', | |
| -# 'ee_int-v3-BC-not-cA.pem', | |
| -# 'ee_int-v3-noBC.pem', | |
| -# 'ee_int-v4-BC-cA.pem', | |
| -# 'ee_int-v4-BC-not-cA.pem', | |
| -# 'ee_int-v4-noBC.pem', | |
| -# 'ee-v1-BC-cA_ca.pem', | |
| -# 'ee-v1-BC-not-cA_ca.pem', | |
| -# 'ee-v1-noBC_ca.pem', | |
| -# 'ee-v2-BC-cA_ca.pem', | |
| -# 'ee-v2-BC-not-cA_ca.pem', | |
| -# 'ee-v2-noBC_ca.pem', | |
| -# 'ee-v3-BC-cA_ca.pem', | |
| -# 'ee-v3-BC-not-cA_ca.pem', | |
| -# 'ee-v3-noBC_ca.pem', | |
| -# 'ee-v4-BC-cA_ca.pem', | |
| -# 'ee-v4-BC-not-cA_ca.pem', | |
| -# 'ee-v4-noBC_ca.pem', | |
| -# 'int-v1-BC-cA_ca.pem', | |
| -# 'int-v1-BC-not-cA_ca.pem', | |
| -# 'int-v1-noBC_ca.pem', | |
| -# 'int-v2-BC-cA_ca.pem', | |
| -# 'int-v2-BC-not-cA_ca.pem', | |
| -# 'int-v2-noBC_ca.pem', | |
| -# 'int-v3-BC-cA_ca.pem', | |
| -# 'int-v3-BC-not-cA_ca.pem', | |
| -# 'int-v3-noBC_ca.pem', | |
| -# 'int-v4-BC-cA_ca.pem', | |
| -# 'int-v4-BC-not-cA_ca.pem', | |
| -# 'int-v4-noBC_ca.pem', | |
| -# 'ss-v1-BC-cA.pem', | |
| -# 'ss-v1-BC-not-cA.pem', | |
| -# 'ss-v1-noBC.pem', | |
| -# 'ss-v2-BC-cA.pem', | |
| -# 'ss-v2-BC-not-cA.pem', | |
| -# 'ss-v2-noBC.pem', | |
| -# 'ss-v3-BC-cA.pem', | |
| -# 'ss-v3-BC-not-cA.pem', | |
| -# 'ss-v3-noBC.pem', | |
| -# 'ss-v4-BC-cA.pem', | |
| -# 'ss-v4-BC-not-cA.pem', | |
| -# 'ss-v4-noBC.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'ee_int-v1-BC-cA.pem', | |
| + 'ee_int-v1-BC-not-cA.pem', | |
| + 'ee_int-v1-noBC.pem', | |
| + 'ee_int-v2-BC-cA.pem', | |
| + 'ee_int-v2-BC-not-cA.pem', | |
| + 'ee_int-v2-noBC.pem', | |
| + 'ee_int-v3-BC-cA.pem', | |
| + 'ee_int-v3-BC-not-cA.pem', | |
| + 'ee_int-v3-noBC.pem', | |
| + 'ee_int-v4-BC-cA.pem', | |
| + 'ee_int-v4-BC-not-cA.pem', | |
| + 'ee_int-v4-noBC.pem', | |
| + 'ee-v1-BC-cA_ca.pem', | |
| + 'ee-v1-BC-not-cA_ca.pem', | |
| + 'ee-v1-noBC_ca.pem', | |
| + 'ee-v2-BC-cA_ca.pem', | |
| + 'ee-v2-BC-not-cA_ca.pem', | |
| + 'ee-v2-noBC_ca.pem', | |
| + 'ee-v3-BC-cA_ca.pem', | |
| + 'ee-v3-BC-not-cA_ca.pem', | |
| + 'ee-v3-noBC_ca.pem', | |
| + 'ee-v4-BC-cA_ca.pem', | |
| + 'ee-v4-BC-not-cA_ca.pem', | |
| + 'ee-v4-noBC_ca.pem', | |
| + 'int-v1-BC-cA_ca.pem', | |
| + 'int-v1-BC-not-cA_ca.pem', | |
| + 'int-v1-noBC_ca.pem', | |
| + 'int-v2-BC-cA_ca.pem', | |
| + 'int-v2-BC-not-cA_ca.pem', | |
| + 'int-v2-noBC_ca.pem', | |
| + 'int-v3-BC-cA_ca.pem', | |
| + 'int-v3-BC-not-cA_ca.pem', | |
| + 'int-v3-noBC_ca.pem', | |
| + 'int-v4-BC-cA_ca.pem', | |
| + 'int-v4-BC-not-cA_ca.pem', | |
| + 'int-v4-noBC_ca.pem', | |
| + 'ss-v1-BC-cA.pem', | |
| + 'ss-v1-BC-not-cA.pem', | |
| + 'ss-v1-noBC.pem', | |
| + 'ss-v2-BC-cA.pem', | |
| + 'ss-v2-BC-not-cA.pem', | |
| + 'ss-v2-noBC.pem', | |
| + 'ss-v3-BC-cA.pem', | |
| + 'ss-v3-BC-not-cA.pem', | |
| + 'ss-v3-noBC.pem', | |
| + 'ss-v4-BC-cA.pem', | |
| + 'ss-v4-BC-not-cA.pem', | |
| + 'ss-v4-noBC.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_content_signing/moz.build b/security/manager/ssl/tests/unit/test_content_signing/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_content_signing/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_content_signing/moz.build | |
| @@ -5,17 +5,17 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'content_signing_int.pem', | |
| -# 'content_signing_onecrl_RSA_ee.pem', | |
| -# 'content_signing_onecrl_ee.pem', | |
| -# 'content_signing_onecrl_ee_expired.pem', | |
| -# 'content_signing_onecrl_ee_not_valid_yet.pem', | |
| -# 'content_signing_onecrl_no_SAN_ee.pem', | |
| -# 'content_signing_onecrl_wrong_key_ee.pem', | |
| -# 'content_signing_remote_newtab_ee.pem', | |
| -# 'content_signing_root.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'content_signing_int.pem', | |
| + 'content_signing_onecrl_RSA_ee.pem', | |
| + 'content_signing_onecrl_ee.pem', | |
| + 'content_signing_onecrl_ee_expired.pem', | |
| + 'content_signing_onecrl_ee_not_valid_yet.pem', | |
| + 'content_signing_onecrl_no_SAN_ee.pem', | |
| + 'content_signing_onecrl_wrong_key_ee.pem', | |
| + 'content_signing_remote_newtab_ee.pem', | |
| + 'content_signing_root.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_ct/moz.build b/security/manager/ssl/tests/unit/test_ct/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_ct/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_ct/moz.build | |
| @@ -5,19 +5,19 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ct-valid.example.com.pem', | |
| -# 'ct-insufficient-scts.example.com.pem', | |
| -# 'default-ee.pem', | |
| -# 'test-ca.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'default-ee.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'ct-valid.example.com.pem', | |
| + 'ct-insufficient-scts.example.com.pem', | |
| + 'default-ee.pem', | |
| + 'test-ca.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'default-ee.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_delegated_credentials/moz.build b/security/manager/ssl/tests/unit/test_delegated_credentials/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_delegated_credentials/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_delegated_credentials/moz.build | |
| @@ -5,20 +5,20 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'test-ca.pem', | |
| -# 'test-int.pem', | |
| -# 'delegated-ee.pem', | |
| -# 'default-ee.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'default-ee.key', | |
| -# 'delegated.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'test-ca.pem', | |
| + 'test-int.pem', | |
| + 'delegated-ee.pem', | |
| + 'default-ee.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'default-ee.key', | |
| + 'delegated.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_ev_certs/moz.build b/security/manager/ssl/tests/unit/test_ev_certs/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_ev_certs/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_ev_certs/moz.build | |
| @@ -5,44 +5,44 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'anyPolicy-ee-path-ee.pem', | |
| -# 'anyPolicy-ee-path-int.pem', | |
| -# 'anyPolicy-int-path-ee.pem', | |
| -# 'anyPolicy-int-path-int.pem', | |
| -# 'cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem', | |
| -# 'cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem', | |
| -# 'cabforum-and-test-oid-ee-path-ee.pem', | |
| -# 'cabforum-and-test-oid-ee-path-int.pem', | |
| -# 'cabforum-oid-path-ee.pem', | |
| -# 'cabforum-oid-path-int.pem', | |
| -# 'evroot.pem', | |
| -# 'no-ocsp-ee-path-ee.pem', | |
| -# 'no-ocsp-ee-path-int.pem', | |
| -# 'no-ocsp-int-path-ee.pem', | |
| -# 'no-ocsp-int-path-int.pem', | |
| -# 'non-ev-root-path-ee.pem', | |
| -# 'non-ev-root-path-int.pem', | |
| -# 'non-evroot-ca.pem', | |
| -# 'reverse-order-oids-path-ee.pem', | |
| -# 'reverse-order-oids-path-int.pem', | |
| -# 'test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem', | |
| -# 'test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem', | |
| -# 'test-and-cabforum-oid-ee-path-ee.pem', | |
| -# 'test-and-cabforum-oid-ee-path-int.pem', | |
| -# 'test-oid-ee-cabforum-oid-int-path-ee.pem', | |
| -# 'test-oid-ee-cabforum-oid-int-path-int.pem', | |
| -# 'test-oid-path-ee.pem', | |
| -# 'test-oid-path-int.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'evroot.key', | |
| -# 'test-oid-path-int.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'anyPolicy-ee-path-ee.pem', | |
| + 'anyPolicy-ee-path-int.pem', | |
| + 'anyPolicy-int-path-ee.pem', | |
| + 'anyPolicy-int-path-int.pem', | |
| + 'cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem', | |
| + 'cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem', | |
| + 'cabforum-and-test-oid-ee-path-ee.pem', | |
| + 'cabforum-and-test-oid-ee-path-int.pem', | |
| + 'cabforum-oid-path-ee.pem', | |
| + 'cabforum-oid-path-int.pem', | |
| + 'evroot.pem', | |
| + 'no-ocsp-ee-path-ee.pem', | |
| + 'no-ocsp-ee-path-int.pem', | |
| + 'no-ocsp-int-path-ee.pem', | |
| + 'no-ocsp-int-path-int.pem', | |
| + 'non-ev-root-path-ee.pem', | |
| + 'non-ev-root-path-int.pem', | |
| + 'non-evroot-ca.pem', | |
| + 'reverse-order-oids-path-ee.pem', | |
| + 'reverse-order-oids-path-int.pem', | |
| + 'test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem', | |
| + 'test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem', | |
| + 'test-and-cabforum-oid-ee-path-ee.pem', | |
| + 'test-and-cabforum-oid-ee-path-int.pem', | |
| + 'test-oid-ee-cabforum-oid-int-path-ee.pem', | |
| + 'test-oid-ee-cabforum-oid-int-path-int.pem', | |
| + 'test-oid-path-ee.pem', | |
| + 'test-oid-path-int.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'evroot.key', | |
| + 'test-oid-path-int.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build b/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build | |
| @@ -5,31 +5,31 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'ee-int-bad-ku-no-eku.pem', | |
| -# 'ee-int-bad-ku-server-eku.pem', | |
| -# 'ee-int-cA-FALSE-asserts-keyCertSign.pem', | |
| -# 'ee-int-limited-depth.pem', | |
| -# 'ee-int-limited-depth-invalid.pem', | |
| -# 'ee-int-no-extensions.pem', | |
| -# 'ee-int-no-ku-no-eku.pem', | |
| -# 'ee-int-no-ku-server-eku.pem', | |
| -# 'ee-int-not-a-ca.pem', | |
| -# 'ee-int-valid-ku-no-eku.pem', | |
| -# 'ee-int-valid-ku-server-eku.pem', | |
| -# 'int-bad-ku-no-eku.pem', | |
| -# 'int-bad-ku-server-eku.pem', | |
| -# 'int-cA-FALSE-asserts-keyCertSign.pem', | |
| -# 'int-limited-depth.pem', | |
| -# 'int-limited-depth-invalid.pem', | |
| -# 'int-no-extensions.pem', | |
| -# 'int-no-ku-no-eku.pem', | |
| -# 'int-no-ku-server-eku.pem', | |
| -# 'int-not-a-ca.pem', | |
| -# 'int-valid-ku-no-eku.pem', | |
| -# 'int-valid-ku-server-eku.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'ee-int-bad-ku-no-eku.pem', | |
| + 'ee-int-bad-ku-server-eku.pem', | |
| + 'ee-int-cA-FALSE-asserts-keyCertSign.pem', | |
| + 'ee-int-limited-depth.pem', | |
| + 'ee-int-limited-depth-invalid.pem', | |
| + 'ee-int-no-extensions.pem', | |
| + 'ee-int-no-ku-no-eku.pem', | |
| + 'ee-int-no-ku-server-eku.pem', | |
| + 'ee-int-not-a-ca.pem', | |
| + 'ee-int-valid-ku-no-eku.pem', | |
| + 'ee-int-valid-ku-server-eku.pem', | |
| + 'int-bad-ku-no-eku.pem', | |
| + 'int-bad-ku-server-eku.pem', | |
| + 'int-cA-FALSE-asserts-keyCertSign.pem', | |
| + 'int-limited-depth.pem', | |
| + 'int-limited-depth-invalid.pem', | |
| + 'int-no-extensions.pem', | |
| + 'int-no-ku-no-eku.pem', | |
| + 'int-no-ku-server-eku.pem', | |
| + 'int-not-a-ca.pem', | |
| + 'int-valid-ku-no-eku.pem', | |
| + 'int-valid-ku-server-eku.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_intermediate_preloads/moz.build b/security/manager/ssl/tests/unit/test_intermediate_preloads/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_intermediate_preloads/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_intermediate_preloads/moz.build | |
| @@ -5,20 +5,20 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ca.pem', | |
| -# 'default-ee.pem', | |
| -# 'ee2.pem', | |
| -# 'int.pem', | |
| -# 'int2.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'default-ee.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'ca.pem', | |
| + 'default-ee.pem', | |
| + 'ee2.pem', | |
| + 'int.pem', | |
| + 'int2.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'default-ee.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_keysize/moz.build b/security/manager/ssl/tests/unit/test_keysize/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_keysize/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_keysize/moz.build | |
| @@ -5,37 +5,37 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# '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_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_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: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + '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_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_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: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/moz.build b/security/manager/ssl/tests/unit/test_keysize_ev/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_keysize_ev/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_keysize_ev/moz.build | |
| @@ -5,27 +5,27 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem', | |
| -# 'ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem', | |
| -# 'ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem', | |
| -# 'ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem', | |
| -# 'ev_int_rsa_2040-evroot.pem', | |
| -# 'ev_int_rsa_2048-ev_root_rsa_2040.pem', | |
| -# 'ev_int_rsa_2048-evroot.pem', | |
| -# 'ev_root_rsa_2040.pem', | |
| -# 'evroot.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'ev_int_rsa_2040.key', | |
| -# 'ev_int_rsa_2048.key', | |
| -# 'ev_root_rsa_2040.key', | |
| -# 'evroot.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem', | |
| + 'ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem', | |
| + 'ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem', | |
| + 'ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem', | |
| + 'ev_int_rsa_2040-evroot.pem', | |
| + 'ev_int_rsa_2048-ev_root_rsa_2040.pem', | |
| + 'ev_int_rsa_2048-evroot.pem', | |
| + 'ev_root_rsa_2040.pem', | |
| + 'evroot.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'ev_int_rsa_2040.key', | |
| + 'ev_int_rsa_2048.key', | |
| + 'ev_root_rsa_2040.key', | |
| + 'evroot.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_missing_intermediate/moz.build b/security/manager/ssl/tests/unit/test_missing_intermediate/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_missing_intermediate/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_missing_intermediate/moz.build | |
| @@ -11,9 +11,9 @@ | |
| # the intermediate in a different directory, so that BadCertAndPinningServer | |
| # doesn't know about it and can't send it in the TLS handshake. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'missing-intermediate.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'missing-intermediate.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_name_constraints/moz.build b/security/manager/ssl/tests/unit/test_name_constraints/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_name_constraints/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_name_constraints/moz.build | |
| @@ -5,17 +5,17 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'NameConstraints.dcissallowed.pem', | |
| -# 'NameConstraints.dcissblocked.pem', | |
| -# 'ca-example-com-permitted.pem', | |
| -# 'int-example-org-permitted.pem', | |
| -# 'ee-example-com-and-org.pem', | |
| -# 'ee-example-com.pem', | |
| -# 'ee-example-org.pem', | |
| -# 'ee-example-test.pem', | |
| -# 'dciss.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'NameConstraints.dcissallowed.pem', | |
| + 'NameConstraints.dcissblocked.pem', | |
| + 'ca-example-com-permitted.pem', | |
| + 'int-example-org-permitted.pem', | |
| + 'ee-example-com-and-org.pem', | |
| + 'ee-example-com.pem', | |
| + 'ee-example-org.pem', | |
| + 'ee-example-test.pem', | |
| + 'dciss.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/moz.build b/security/manager/ssl/tests/unit/test_ocsp_url/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_ocsp_url/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_ocsp_url/moz.build | |
| @@ -5,29 +5,29 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'bad-scheme.pem', | |
| -# 'ca.pem', | |
| -# 'empty-scheme-url.pem', | |
| -# 'ftp-url.pem', | |
| -# 'hTTp-url.pem', | |
| -# 'https-url.pem', | |
| -# 'int.pem', | |
| -# 'negative-port.pem', | |
| -# 'no-host-url.pem', | |
| -# 'no-path-url.pem', | |
| -# 'no-scheme-host-port.pem', | |
| -# 'no-scheme-url.pem', | |
| -# 'unknown-scheme.pem', | |
| -# 'user-pass.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'int.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'bad-scheme.pem', | |
| + 'ca.pem', | |
| + 'empty-scheme-url.pem', | |
| + 'ftp-url.pem', | |
| + 'hTTp-url.pem', | |
| + 'https-url.pem', | |
| + 'int.pem', | |
| + 'negative-port.pem', | |
| + 'no-host-url.pem', | |
| + 'no-path-url.pem', | |
| + 'no-scheme-host-port.pem', | |
| + 'no-scheme-url.pem', | |
| + 'unknown-scheme.pem', | |
| + 'user-pass.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'int.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/security/manager/ssl/tests/unit/test_onecrl/moz.build b/security/manager/ssl/tests/unit/test_onecrl/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_onecrl/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_onecrl/moz.build | |
| @@ -5,14 +5,14 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'another-ee-revoked-by-revocations-txt-serial-2.pem', | |
| -# 'another-ee-revoked-by-revocations-txt.pem', | |
| -# 'ee-revoked-by-revocations-txt.pem', | |
| -# 'ee-revoked-by-subject-and-pubkey.pem', | |
| -# 'same-issuer-ee.pem', | |
| -# 'test-int-ee.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'another-ee-revoked-by-revocations-txt-serial-2.pem', | |
| + 'another-ee-revoked-by-revocations-txt.pem', | |
| + 'ee-revoked-by-revocations-txt.pem', | |
| + 'ee-revoked-by-subject-and-pubkey.pem', | |
| + 'same-issuer-ee.pem', | |
| + 'test-int-ee.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_pinning_dynamic/moz.build b/security/manager/ssl/tests/unit/test_pinning_dynamic/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_pinning_dynamic/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_pinning_dynamic/moz.build | |
| @@ -5,22 +5,22 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'badca.pem', | |
| -# 'a.pinning2.example.com-badca.pem', | |
| -# 'a.pinning2.example.com-pinningroot.pem', | |
| -# 'a.preload.example.com-badca.pem', | |
| -# 'a.preload.example.com-pinningroot.pem', | |
| -# 'b.pinning2.example.com-badca.pem', | |
| -# 'b.pinning2.example.com-pinningroot.pem', | |
| -# 'b.preload.example.com-badca.pem', | |
| -# 'b.preload.example.com-pinningroot.pem', | |
| -# 'x.a.pinning2.example.com-badca.pem', | |
| -# 'x.a.pinning2.example.com-pinningroot.pem', | |
| -# 'x.b.pinning2.example.com-badca.pem', | |
| -# 'x.b.pinning2.example.com-pinningroot.pem', | |
| -# 'pinningroot.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'badca.pem', | |
| + 'a.pinning2.example.com-badca.pem', | |
| + 'a.pinning2.example.com-pinningroot.pem', | |
| + 'a.preload.example.com-badca.pem', | |
| + 'a.preload.example.com-pinningroot.pem', | |
| + 'b.pinning2.example.com-badca.pem', | |
| + 'b.pinning2.example.com-pinningroot.pem', | |
| + 'b.preload.example.com-badca.pem', | |
| + 'b.preload.example.com-pinningroot.pem', | |
| + 'x.a.pinning2.example.com-badca.pem', | |
| + 'x.a.pinning2.example.com-pinningroot.pem', | |
| + 'x.b.pinning2.example.com-badca.pem', | |
| + 'x.b.pinning2.example.com-pinningroot.pem', | |
| + 'pinningroot.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_sanctions/moz.build b/security/manager/ssl/tests/unit/test_sanctions/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_sanctions/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_sanctions/moz.build | |
| @@ -5,17 +5,17 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'default-ee.pem', | |
| -# 'symantec-ee-from-whitelist-after-cutoff.pem', | |
| -# 'symantec-ee-from-whitelist-before-cutoff.pem', | |
| -# 'symantec-ee-not-whitelisted-after-cutoff.pem', | |
| -# 'symantec-ee-not-whitelisted-before-cutoff.pem', | |
| -# 'symantec-intermediate-other.pem', | |
| -# 'symantec-intermediate-other-crossigned.pem', | |
| -# 'symantec-intermediate-whitelisted.pem', | |
| -# 'symantec-test-ca.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'default-ee.pem', | |
| + 'symantec-ee-from-whitelist-after-cutoff.pem', | |
| + 'symantec-ee-from-whitelist-before-cutoff.pem', | |
| + 'symantec-ee-not-whitelisted-after-cutoff.pem', | |
| + 'symantec-ee-not-whitelisted-before-cutoff.pem', | |
| + 'symantec-intermediate-other.pem', | |
| + 'symantec-intermediate-other-crossigned.pem', | |
| + 'symantec-intermediate-whitelisted.pem', | |
| + 'symantec-test-ca.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_signed_apps/moz.build b/security/manager/ssl/tests/unit/test_signed_apps/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_signed_apps/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_signed_apps/moz.build | |
| @@ -35,37 +35,37 @@ def SignedAppFile(name, flags, app_direc | |
| # hashes, and the pkcs#7 file only has sha-256. | |
| # | |
| # Temporarily disabled. See bug 1256495. | |
| -#signed_app_files = ( | |
| -# ['unknown_issuer_app.zip', '-i', 'unknown issuer', '-p', 'sha256'], | |
| -# ['unsigned_app.zip'], | |
| -# ['empty_signerInfos.zip', '-e'], | |
| -#) | |
| -# | |
| -#for signed_app_file_params in signed_app_files: | |
| -# SignedAppFile(signed_app_file_params[0], signed_app_file_params[1:]) | |
| -# | |
| -#for mf_algs in [['1'], ['256'], ['1', '256']]: | |
| -# for sf_algs in [['1'], ['256'], ['1', '256']]: | |
| -# for p7_algs in [['1'], ['256'], ['1', '256']]: | |
| -# filename = "app_mf-%s_sf-%s_p7-%s.zip" % ('-'.join(mf_algs), '-'.join(sf_algs), '-'.join(p7_algs)) | |
| -# args = [] | |
| -# for mf_alg in mf_algs: | |
| -# args.append('-m') | |
| -# args.append('sha%s' % mf_alg) | |
| -# for sf_alg in sf_algs: | |
| -# args.append('-s') | |
| -# args.append('sha%s' % sf_alg) | |
| -# for p7_alg in p7_algs: | |
| -# args.append('-p') | |
| -# args.append('sha%s' % p7_alg) | |
| -# SignedAppFile(filename, args) | |
| -# | |
| +signed_app_files = ( | |
| + ['unknown_issuer_app.zip', '-i', 'unknown issuer', '-p', 'sha256'], | |
| + ['unsigned_app.zip'], | |
| + ['empty_signerInfos.zip', '-e'], | |
| +) | |
| + | |
| +for signed_app_file_params in signed_app_files: | |
| + SignedAppFile(signed_app_file_params[0], signed_app_file_params[1:]) | |
| + | |
| +for mf_algs in [['1'], ['256'], ['1', '256']]: | |
| + for sf_algs in [['1'], ['256'], ['1', '256']]: | |
| + for p7_algs in [['1'], ['256'], ['1', '256']]: | |
| + filename = "app_mf-%s_sf-%s_p7-%s.zip" % ('-'.join(mf_algs), '-'.join(sf_algs), '-'.join(p7_algs)) | |
| + args = [] | |
| + for mf_alg in mf_algs: | |
| + args.append('-m') | |
| + args.append('sha%s' % mf_alg) | |
| + for sf_alg in sf_algs: | |
| + args.append('-s') | |
| + args.append('sha%s' % sf_alg) | |
| + for p7_alg in p7_algs: | |
| + args.append('-p') | |
| + args.append('sha%s' % p7_alg) | |
| + SignedAppFile(filename, args) | |
| + | |
| # COSE test-cases | |
| -#SignedAppFile('cose_signed_with_pkcs7.zip', ['-c', 'ES256', '-p', 'sha256']) | |
| -#SignedAppFile('cose_int_signed_with_pkcs7.zip', ['-c', 'ES256', '-r', 'xpcshell signed apps test root', '-p', 'sha256']) | |
| -#SignedAppFile('cose_multiple_signed_with_pkcs7.zip', ['-c', 'ES256', '-c', 'ES384', '-p', 'sha256']) | |
| -#SignedAppFile('only_cose_signed.zip', ['-c', 'ES256']) | |
| -#SignedAppFile('only_cose_multiple_signed.zip', ['-c', 'ES384', '-c', 'ES256']) | |
| -#SignedAppFile('cose_tampered_good_pkcs7.zip', ['-m', 'sha1', '-s', 'sha1', '-p', 'sha1'], 'app_cose_tampered/') | |
| -#SignedAppFile('big_manifest.zip', ['-p', 'sha256', '--pad-headers', '2']) | |
| -#SignedAppFile('huge_manifest.zip', ['-p', 'sha256', '--pad-headers', '10']) | |
| +SignedAppFile('cose_signed_with_pkcs7.zip', ['-c', 'ES256', '-p', 'sha256']) | |
| +SignedAppFile('cose_int_signed_with_pkcs7.zip', ['-c', 'ES256', '-r', 'xpcshell signed apps test root', '-p', 'sha256']) | |
| +SignedAppFile('cose_multiple_signed_with_pkcs7.zip', ['-c', 'ES256', '-c', 'ES384', '-p', 'sha256']) | |
| +SignedAppFile('only_cose_signed.zip', ['-c', 'ES256']) | |
| +SignedAppFile('only_cose_multiple_signed.zip', ['-c', 'ES384', '-c', 'ES256']) | |
| +SignedAppFile('cose_tampered_good_pkcs7.zip', ['-m', 'sha1', '-s', 'sha1', '-p', 'sha1'], 'app_cose_tampered/') | |
| +SignedAppFile('big_manifest.zip', ['-p', 'sha256', '--pad-headers', '2']) | |
| +SignedAppFile('huge_manifest.zip', ['-p', 'sha256', '--pad-headers', '10']) | |
| diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build b/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build | |
| @@ -5,15 +5,15 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'StartCom-after-cutoff.pem', | |
| -# 'StartCom-before-cutoff.pem', | |
| -# 'StartComCA.pem', | |
| -# 'WoSign-after-cutoff.pem', | |
| -# 'WoSign-before-cutoff.pem', | |
| -# 'WoSignCA.pem', | |
| -# 'ca.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| +test_certificates = ( | |
| + 'StartCom-after-cutoff.pem', | |
| + 'StartCom-before-cutoff.pem', | |
| + 'StartComCA.pem', | |
| + 'WoSign-after-cutoff.pem', | |
| + 'WoSign-before-cutoff.pem', | |
| + 'WoSignCA.pem', | |
| + 'ca.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| diff --git a/security/manager/ssl/tests/unit/test_validity/moz.build b/security/manager/ssl/tests/unit/test_validity/moz.build | |
| --- a/security/manager/ssl/tests/unit/test_validity/moz.build | |
| +++ b/security/manager/ssl/tests/unit/test_validity/moz.build | |
| @@ -5,20 +5,20 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#test_certificates = ( | |
| -# 'ev_ee_27_months-ev_int_60_months-evroot.pem', | |
| -# 'ev_ee_28_months-ev_int_60_months-evroot.pem', | |
| -# 'ev_int_60_months-evroot.pem', | |
| -# 'evroot.pem', | |
| -#) | |
| -# | |
| -#for test_certificate in test_certificates: | |
| -# GeneratedTestCertificate(test_certificate) | |
| -# | |
| -#test_keys = ( | |
| -# 'ev_int_60_months-evroot.key', | |
| -# 'evroot.key', | |
| -#) | |
| -# | |
| -#for test_key in test_keys: | |
| -# GeneratedTestKey(test_key) | |
| +test_certificates = ( | |
| + 'ev_ee_27_months-ev_int_60_months-evroot.pem', | |
| + 'ev_ee_28_months-ev_int_60_months-evroot.pem', | |
| + 'ev_int_60_months-evroot.pem', | |
| + 'evroot.pem', | |
| +) | |
| + | |
| +for test_certificate in test_certificates: | |
| + GeneratedTestCertificate(test_certificate) | |
| + | |
| +test_keys = ( | |
| + 'ev_int_60_months-evroot.key', | |
| + 'evroot.key', | |
| +) | |
| + | |
| +for test_key in test_keys: | |
| + GeneratedTestKey(test_key) | |
| diff --git a/testing/xpcshell/moz-http2/moz.build b/testing/xpcshell/moz-http2/moz.build | |
| --- a/testing/xpcshell/moz-http2/moz.build | |
| +++ b/testing/xpcshell/moz-http2/moz.build | |
| @@ -5,5 +5,5 @@ | |
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
| # Temporarily disabled. See bug 1256495. | |
| -#GeneratedTestCertificate('http2-cert.pem') | |
| -#GeneratedTestKey('http2-cert.key') | |
| +GeneratedTestCertificate('http2-cert.pem') | |
| +GeneratedTestKey('http2-cert.key') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment