Bug 1525191 - Regenerate all .pem.certspec files into their .pems r=try a=try CLOSED TREE
authorJ.C. Jones <jjones@mozilla.com>
Tue, 05 Feb 2019 04:34:13 +0200
changeset 514545 b6ec07118c70
parent 514544 f9b86dec401e
child 514546 66ff28da3e7d
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstry, try
bugs1525191
milestone67.0a1
first release with
nightly linux32
b6ec07118c70 / 67.0a1 / 20190205023948 / files
nightly linux64
b6ec07118c70 / 67.0a1 / 20190205023948 / files
nightly mac
b6ec07118c70 / 67.0a1 / 20190205023948 / files
nightly win32
b6ec07118c70 / 67.0a1 / 20190205023948 / files
nightly win64
b6ec07118c70 / 67.0a1 / 20190205023948 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1525191 - Regenerate all .pem.certspec files into their .pems r=try a=try CLOSED TREE Summary: Scripts: https://gist.github.com/jcjones/b25e07de3a48c3ed084f0f9e26911693 # From the above gist ./jcj-regenerate-certspecs # This is a DER form, not a PEM. openssl x509 -in security/manager/ssl/tests/unit/test_signed_apps/xpcshellTestRoot.pem -outform der > security/manager/ssl/tests/unit/test_signed_apps/xpcshellTestRoot.der rm security/manager/ssl/tests/unit/test_signed_apps/xpcshellTestRoot.pem # These don't seem to be checked in rm services/common/tests/unit/test_blocklist_signatures/*.pem Reviewers: ccoroiu Bug #: 1525191 Differential Revision: https://phabricator.services.mozilla.com/D18638
security/manager/ssl/tests/mochitest/browser/ca.pem
security/manager/ssl/tests/mochitest/browser/code-ee.pem
security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
security/manager/ssl/tests/mochitest/browser/email-ee.pem
security/manager/ssl/tests/mochitest/browser/expired-ca.pem
security/manager/ssl/tests/mochitest/browser/has-cn.pem
security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
security/manager/ssl/tests/mochitest/browser/has-o.pem
security/manager/ssl/tests/mochitest/browser/has-ou.pem
security/manager/ssl/tests/mochitest/browser/invalid.pem
security/manager/ssl/tests/mochitest/browser/longOID.pem
security/manager/ssl/tests/mochitest/browser/md5-ee.pem
security/manager/ssl/tests/mochitest/browser/revoked.pem
security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
security/manager/ssl/tests/unit/bad_certs/default-ee.pem
security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem
security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem
security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
security/manager/ssl/tests/unit/bad_certs/ev-test.pem
security/manager/ssl/tests/unit/bad_certs/evroot.pem
security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
security/manager/ssl/tests/unit/bad_certs/md5signature.pem
security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
security/manager/ssl/tests/unit/bad_certs/mismatch.pem
security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
security/manager/ssl/tests/unit/bad_certs/mitm.pem
security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
security/manager/ssl/tests/unit/bad_certs/test-ca.pem
security/manager/ssl/tests/unit/bad_certs/test-int.pem
security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
security/manager/ssl/tests/unit/test_cert_eku/ca.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
security/manager/ssl/tests/unit/test_cert_trust/ca.pem
security/manager/ssl/tests/unit/test_cert_trust/ee.pem
security/manager/ssl/tests/unit/test_cert_trust/int.pem
security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem
security/manager/ssl/tests/unit/test_cert_version/ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem
security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee_expired.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee_not_valid_yet.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem
security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem
security/manager/ssl/tests/unit/test_ct/ct-insufficient-scts.example.com.pem
security/manager/ssl/tests/unit/test_ct/ct-valid.example.com.pem
security/manager/ssl/tests/unit/test_ct/default-ee.pem
security/manager/ssl/tests/unit/test_ct/test-ca.pem
security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/evroot.pem
security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem
security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem
security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem
security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem
security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem
security/manager/ssl/tests/unit/test_intermediate_preloads/ca.pem
security/manager/ssl/tests/unit/test_intermediate_preloads/ee.pem
security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem
security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem
security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem
security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem
security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem
security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem
security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem
security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem
security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem
security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem
security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem
security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem
security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem
security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem
security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem
security/manager/ssl/tests/unit/test_missing_intermediate/missing-intermediate.pem
security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem
security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem
security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem
security/manager/ssl/tests/unit/test_name_constraints/dciss.pem
security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem
security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem
security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem
security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem
security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem
security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem
security/manager/ssl/tests/unit/test_ocsp_url/ca.pem
security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/int.pem
security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem
security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem
security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem
security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem
security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem
security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem
security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/a.pinning2.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/a.pinning2.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/a.preload.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/a.preload.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/b.pinning2.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/b.pinning2.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/b.preload.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/b.preload.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/x.a.pinning2.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/x.a.pinning2.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/x.b.pinning2.example.com-badca.pem
security/manager/ssl/tests/unit/test_pinning_dynamic/x.b.pinning2.example.com-pinningroot.pem
security/manager/ssl/tests/unit/test_signed_apps/xpcshellTestRoot.der
security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem
security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem
security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem
security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem
security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem
security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem
security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/default-ee.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/ee-from-whitelist-after-cutoff.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/ee-from-whitelist-before-cutoff.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/ee-not-whitelisted-after-cutoff.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/ee-not-whitelisted-before-cutoff.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/intermediate-other-crossigned.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/intermediate-other.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/intermediate-whitelisted.pem
security/manager/ssl/tests/unit/test_symantec_apple_google/test-ca.pem
security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem
security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem
security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem
security/manager/ssl/tests/unit/test_validity/evroot.pem
--- a/security/manager/ssl/tests/mochitest/browser/ca.pem
+++ b/security/manager/ssl/tests/mochitest/browser/ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIURxOdvmKY1LMeejuRTiuHeGBhZHwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyTCCAbGgAwIBAgIUQ7f25Fqhl2uttzpbSpf0KNynuVgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBXd3Rnz2WW+aczo/SPlYSst4Bp
-hWx6S3ncLB4RznGMCTndfJCkpOdkDvDi9swIN4xO19XlUJFX5FiJ9vbjrxgz1hV9
-/FsqApPRAMuA6cWMOFWtIu/qgurcCMpgcPyO6MKGR1YH1C2fpVIDIDc/ID7sIpLt
-m208pK6P9J61ka0QqjQkQZ1aDulBj+6Ic5GYwyJXAWyE3OoUJPteGM12yfT/7lOC
-ObxJaqJrOYQEmI2ZZQ67MjDgfvivopIFQKOJvlBJKHujDSz3ZFykwx7CwnvN74sJ
-07snm4Vz6lAKESVa4H65oExOqL1kEMQQKyNmOKEAMOmHM+L4toh17ax4q2xP
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBrGiDYu+Y+mWVY+itzQlrQC2V1
+btQ30srH1mHjNnHcxZsZgF1Wb9NP8MVw+Z94tsvOBYMK9CRtvdhoTsBxYWkkksYB
+MUKCeF01exMTEjuJMrQjU2oG60G2tZn94LjD3yN7EMmqj+JxFFMnu0oVY/sIKpV4
+KJO2sksV9igJLMh6wJcKkvjybceTjsHeJ2FEXmcNvRu7TtxU1j99ReKu6VWsb+l0
+oZK930au1ErIzFAZr4vQ8c7qQd+rlx6RX2Ulh7S3mjPGxzPkYFxWxW2KcosTF3U1
+nIAW0wneZLEdgMXkgZXUAz6eYY4cF0F18eaIhpt8kWGU87p3HBBRmnuGAQC3
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/code-ee.pem
+++ b/security/manager/ssl/tests/mochitest/browser/code-ee.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyDCCAbCgAwIBAgIUYRRSBhLBE00RmXG2Qj8QC28VfCgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyDCCAbCgAwIBAgIUVfTllW99rPEDhBQ5ckZ5K2HMXtUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHY29kZS1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMXMBUwEwYDVR0lBAwwCgYI
-KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAHNzZZRzK2uUrNqeeMorK0IjPtcQ
-x38JxoeCcTjAXSlJ/XXo17xbkXjgJaB5Zoon49TjEzk142FnQhT/meME2CR70hxw
-FwQ/d8E7HP8wYLKVSKV6sweadIDzuDP9A49t55VvgGF4QdbVkAboAD2B2NN9r36n
-E/AsD9vVsRSISvMftxb4advQxpeZ0cgjN4K4vRJKUfpm+ved/DvrL7KdZ2JSM+wI
-cdrAsTe3d4Z/XJlBA3Ps8O6Y0r8Ktqk1QIPCtN9dufE7oQ7GyJ9DXeNbUedffDPd
-mUKfT55NGQcVGTycKmgK/A2qRbEQZ0z/PLPfR7c6cGFAMK1nGtd+E4P+tFU=
+KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBABleBQX42MiEhv9PhHhIQU8n+thw
+M0EyMvD/N+Zr7QW+RDn+s5rUJ/lST4h4Lnh+Mwy4TqXPKCGLEa3XhHt/cQCzAOdx
+e2JbsARFk0nvM2ACwGycDsHZSBPEF6+WrXkUHTKFECmjWabtYe2psNOd+AYyGm/j
+T15hKwJn0N7TowY3Fq0N/am73Pa2Pf1gItj0Smzc2dz1M9VUhRcoslRFDtVBsXZP
+QcQ55/mglpWGxzM9UkQdvmNF2aR9eRyaeIncK9oManAqO4L/eo9kbCVzj7Nu9FPT
+Xb6Jw5QUzyyXtfGpOneQi2dy82vLca4KSgb4aNkq2sVxwxzwPqVP14inI94=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
+++ b/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwjCCAaqgAwIBAgIUY+9qYYcj5VkUnYmcumgGq1y2Os8wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKZXhwaXJlZC1jYTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIw
-MTkwMjA1MDAwMDAwWjAdMRswGQYDVQQDDBJlZS1mcm9tLWV4cGlyZWQtY2EwggEi
+MIICwjCCAaqgAwIBAgIUb+Uv5E1DdRdfZMvPrBZ3uepqsCQwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKZXhwaXJlZC1jYTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
+MjAwMjA1MDAwMDAwWjAdMRswGQYDVQQDDBJlZS1mcm9tLWV4cGlyZWQtY2EwggEi
 MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT
 2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzV
 JJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8N
 jf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCA
 BiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVh
 He4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBAHr2h9KL7WZJEEVnyFpXdkPQDa9UhRWNxcsg
-pGWyH8VeqYHMj5Cnx7SOiWlA362k2QT4g0aajZyET3L5F9ygfXglbN2WW4IRBT3x
-9i2sNlX7Bv4H3oeFPDJTdAJI0hbYkZnIw/DFnrVe9XK4ks4QkcxgrC1dH8dWIB9D
-r7C7577PzFJ1yLALJ5mrR37YMWSksMba8OS3auwOMmVZ6rAUQuhSjq1tWVWgB/OE
-AQp3FhzyW2OgI/yB0r/GZR6GVpUjGc/J54Ru2/8N8b1/0HHXoeVpmw304cR67hfS
-uDuU7XRJN5qHwOAeD6EJjn6l3Yse4xQWrotvqjhbVH9J2EUD3pg=
+AAEwDQYJKoZIhvcNAQELBQADggEBAJkjDMADovU3FKzQ5xgE/JiZZ1HVkf1NSO0q
+cM9vGBLo2ZdJIAnCHwff6YquLYZ8KnVzoRIa/5tlWFkNrTC1jYICpfdb/79YOqbY
+3Hwi0fNXnMmCCsC7mAZ7VIGks5PgSfhM8E1JlUUmP7FZbaHOSUmgMlbUrA2P35Ow
+Bxv9lOnlBEUr76UGAQi7R0odKQrrWmjnievNYjXW4lP97NYc1SX0xYlIkU/610pB
+PTuoMgu2Mb4uQgKQc+0Dwf2B5dC4t1YoHfpH6cdRQ0H6c9OKGvok2wS6vyzJ6bfj
+QxGUFP/2UMUhan/A4dlhCbafopcLj6OqY5moKpF49py+wunF3IA=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
+++ b/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUH7VF27U+T0OpWyGnJC4ot8NFtP4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMB8xHTAbBgNVBAMMFGVlLWZyb20tdW50cnVzdGVkLWNh
+MIICxjCCAa6gAwIBAgIUAwuzONlPMdZuwtqpIrM6ZFzKsPIwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMB8xHTAbBgNVBAMMFGVlLWZyb20tdW50cnVzdGVkLWNh
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB2Z7lT/3Cuo9yocI0Q/iNIB7w5X6ET
-uwf6B3zG73vhGgQ1QBPqPZ+Fl95Yj9KLY/wEsyRoU+ApSbs08HeNXeLfA7OX4kcZ
-KqLh9hlU5RWIvz54Arf5t/6HDjEsehY0yV3W+C0+xBXe+on36t5gQBRB+vMpXe0H
-QIPCKl46vRGHp2cvRvhRh0eChdts50U45XQzlIW/NTzbTxAMcvMaLngOLmNZftos
-9+wJCIB+wJXBYxKgQZy3oiO0MUw/rbF88jjiqF32mjfTHBPK/f+m7zsn6halLuov
-NxlJ47rRFN93SP99NrEKL7G0YpRSZ602nkD4QgoXabOfQz+aKW4uIbfL
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCTrcRx9RzmUyAmz6stV2SJHefRrHDt
+nO5VD7T2pKqeYiFXDG5wM33uphoGaYDYROmmYwWL/cr3fDliVFuza2Q0ve+UF1R7
+vaI4khSiYozAa5y4Ao3gWNUM6wYShYSnKVkGs+p4rds50+PJmlXi+fHZ8vcrT6P5
+VSiQQSGfnDRdG6icQydTqnAnI3gKOtI5lJ++MpNobSe9zJvPJWFLU0PGcStxMSjJ
+/KayaF8W8+OpsJEq2Tf2FcgdKjtLXu6624cO3nbJn02K2jjyueTcsrus0p8VPq5r
+dOP3Jq97x3/qC1mIHkahCUfcMIX0luAD1xAOlIAYbIAtEf2qhY8x7s2Y
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/email-ee.pem
+++ b/security/manager/ssl/tests/mochitest/browser/email-ee.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIURRIBERLVVDIWwh1MBxKN2wpZl18wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyTCCAbGgAwIBAgIUDzKY7KpX+RDscj2C/GnMdV8KSs4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZW1haWwtZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
 5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQ
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoG
-CCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4IBAQAynycxGl6QiOLMIY+VHSQu+ZGc
-bZu6NlWZrNzg46MkNqgrDSR+WAA+F1PBs3zn4xUpdzlYut1yeOixwq4DYfzminIj
-iBASlz6EtHWEMcaIKDe/VJGILlIVXCgSGWap0G9Z5iE3I2sKL40wiAc2DxCTXt6A
-6T/JXF4IxbFFzme9mRriLbjXayzj6n7swi/OWE0mPKmAJkRQx5e/fKmFUDA/6LD6
-kqg++JZ7vG+UNOpuu1xnptXm+J3cjnvGCsJ0EkARhSQxbTVJ9PEoLww0dLooHUHx
-FgGUEwd08XB7Jxl6Xi1m9C+glMqe62TNPPeAN9ia29EcRV6lpVj7waMBJP5j
+CCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4IBAQBDQN1dWyxMG1VrRW/IoJiTxpds
+A2HwPZnKWwyOdGtV9uT8AKhfwrTI/D0B5agUX1j57ut7L3wX6dPqqY+95vUabvzW
+xbLbp9fHD7fb69kxl+7oNk65dkDj8sx7i/mPedIQOc1yiUAQAVS2CLotYE2Hx5wz
+ndyIDUk2+jLE6D/NTTnt9TbssTUDayx4A1YBMdIypO23IaOaicJSdXMyxIaVxxxx
+996p0kqYt52CvyVjJ1+rN/9Ke8fAb+t1SueiiAQ8B4GpJeXAF0LXhmH1HnzzbiGZ
+M+mZHzVOU+S8ZK4N7881uZ8NyAb4zdNboTe4aVHAyIQ87WBL+hvd5XYxFPj1
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/expired-ca.pem
+++ b/security/manager/ssl/tests/mochitest/browser/expired-ca.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC0TCCAbmgAwIBAgIUS6xUkMzG2REizII2g+VecO/KqX8wDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxMDAxMDEwMDAwMDBaGA8yMDExMDEwMTAw
 MDAwMFowFTETMBEGA1UEAwwKZXhwaXJlZC1jYTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
--- a/security/manager/ssl/tests/mochitest/browser/has-cn.pem
+++ b/security/manager/ssl/tests/mochitest/browser/has-cn.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUWScHFXCspsSFhRp6DQRKOBMGtY4wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1DCCAbygAwIBAgIUf35wSg82zO0PeY9SlCRmQTXcSQQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowNzEMMAoGA1UEAwwDRm9vMQwwCgYDVQQLDANCYXIxDDAKBgNVBAoMA0Jh
 ejELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP
 8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OI
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
-I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKBkg7GpGnxM
-ijgCX7kjN54eBadRM89a+I1vYvUD0wB8pmnV5DYcpolek+zHgtkIX29I9CAuGZyA
-tVhKxKU5nv/0YbL6NCCblA2tT7+/4mpLTnd13hqpie7nzhB0Dgw+n4oNqYMjf9Jw
-7M9Vb/lnpYTuB7eOng4PxOnCeFwmN6ZAq9z63kg2ucJDnhhLYUIkrsiHdZOV4TJd
-5Og0oI7veJQkasDanrbIhL84lSs6vHqEh/EkF+o+2rYoZu4ZRQPhgavmuulkyMak
-UvYjb6jZupnd3FdEtq2Nw3eLwJhz/RtFUKaQRDerE/tl58tUc4ZqlZqTMyhcfgSS
-9no4tPY9O3Y=
+I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIFKCmGmg9yx
+I/VqAQKhtq9TrsbE55E/fCS4zbtVG+bVlQ0a2eO7tPi8nV5VUmU65ye0Pgzaperm
+9H8vCNsiXIGU4GHiB0cnlUyWiFMaJSzNyRBWRzYAhVnjiGfQXhSKTbOD/Lg2oS3Q
+oZ0RGqS6Ctst1leGLZ/cN7lrMjxwDrslQaFRozkbKz/aJI9sG6oQPKz9IP5+rTRj
+ljSii/gejdBWe5PpCVJ2caXKmWX6ILk9Wg9cSpHxNWbO8ExlPaknn+pxHHn/V2or
+Az8RKc4B/xwrvqszkcdiaOISKB4cU97rU1qjojn3kv3hcMfQCjpRoJbWlCSiD69s
+EsvEqb9dNtk=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
+++ b/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
@@ -1,16 +1,17 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICijCCAXKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJjYTAi
-GA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAAMIIBIjANBgkqhkiG
+GA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAAMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQC1b7uDddK6oKhyLQ19ONDvqFZld+bvdi8/SyU2NLZ8TBf6
-ko9hM+yg4ukr1RdDmmBak+J6fnl5GD9EDX3jVvHzmfbPBYlbiiAXyFwDHoddCyQT
-Xt9FQxONt2zoKIMpxOpA1DSK6h/ixPZyprjWKkOrqrXGAV4b03WWHpWi9yn8u5UK
-vkfAqHD3RF4cgWQ25ARn8t5uDZ7AArwgYcMMlT70ihUf4DRxGHIxrkhUjqARPQhi
-GNDW7ppdZjj+7Jq7jqcPXdmplQliLxhvEFOWwCS7hMkVxd0fsAtHCtSM1GyW2vEh
-Xet1eSwfn9pNbVDGC2F1wwgRbMLdcE8PPbytmQrB
+SIb3DQEBCwUAA4IBAQClK6sswv88we7+HGmKFJaTZFQUf6LO57rBk+pehSJQbI6Y
+9vasVE0eA8QTJuBMFJnBA+OQk1cCCDurtatNDxfOA+KSDwGyNydgWtdTCjRyqwVE
+Bu94bab8NRnL+cogTvIVjVJQT7lub1OI9SPx1QHz2e6OC87vpmAx1fTfXoQAqg/N
+duu7o162JuT+tCipMgoPjiWIi4CD/IQl5vftbaElQu9UNFzNJvzF4roBwmKfOzvT
+9ticZxW6kaFwN3YGUXy8JhV/jax7N04qycIwmkGAfoHiaNyBhcT4ZgNAFEm7Jd0u
+FiaEFc/A72fMRNjFM73LnaMicUQjyzHl66vKU7aX
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
+++ b/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICqjCCAZKgAwIBAgIUUa62ashpMNiQFURL+gWho/WeXmwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICqjCCAZKgAwIBAgIUZVjNK3vNN9f42y7bG7BO3v8IjNcwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
-FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACz1
-g5fXT+uZM4vsFSmTd+kcmmQcRrDZS+k6tQ2j6ORSkxFEIJV0jod/wEPuDf9bVvUI
-XJrmc7VUGKt3fcb6knG/NC52ARxsMAdixURjR0Z1TEYbePrt+Wuame1SMxWEMszI
-yROQPb5It5TwKJDhYLTtmoQrQeg4bt9TzTKfJqSgmgZCblattNWOdMzw8wLEWzmO
-GmwbWmUV3ACxcx+0JmObA6AVaSqlyxB1RjGxTZHrzNGoUJaJ8Qcm52QsjVgao75L
-dtL4d/oqOYh091hqXwAyER2uFWKa0/UoGnnks0Gh65OQma+Hag1gVdneh+eWUVIA
-AKFe/aHTnVTR1KQ7DwE=
+FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEZ8
+4addHpCw900+XBcY+Q6/eD405ijbl5uRUwe54C90qgOUUUIwZTrcDWuWCemFXGo3
+749tuoXomVyekD1XI0pVrLnx6b4FOOjFKQBXbZVL16cNmOHjW9RdIapkikzNGE+X
+4yNem/f7IPJcLsV7tr6wfGSyutm5MpOf0u/l2bS0TNCMZZZ8c6eqRkDansinS2A3
+Djs84SaVso3f98cD+4ghMLGrnq2neSU+AAiJjfgn2C1SvRJ6NQj+HYk+ELQoPU/D
+ZvGUovYYbdgWvu8Cgw4uHuxGkHSM2LPQm2DLAmr/rnNU7RiID+lAyxD9cyXptSah
+f8wlGq/E1oHb0RiTkSk=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/has-o.pem
+++ b/security/manager/ssl/tests/mochitest/browser/has-o.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUO7gf9kdNMUiDuYA/wucqg8MBk9wwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICuDCCAaCgAwIBAgIUHXTRJ4gAtUw41YDQ95WzlIwFeeswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGzEMMAoGA1UECgwDQmF6MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAUK+hd7jN52+15FkpS+x/vTSMtbdz/rV0/t9l7frNEQgIX0Wd
-bEzb4HBvm6tMkuUFClJEvAVGk5mgxlrDYxjQC/UD7qzZoMnb7WLyz6d4dnnsl61h
-EaW2USARcGzwKMQR0+p1zlGvS3o3nGOfc2cvwXyt5tSSoS/B/FE4nM5lKK/eJFPa
-FyNTnqemYzt+5fdTQNbvHcw+t35MHeoQIAiJnkpLjeRKA6OZJ3xbhFDWjpxqBjfR
-y+ZLkuud1eIiCFeZsoIYEvs5EhfbFqUlpHqh0HKDN1eX9djyYSs6Wxkh7kgl1oH4
-X6hEzFWpdHqhyook+RZlxt7NN22jIh8DGrJuMw==
+9w0BAQsFAAOCAQEApOTrD7MSbolAE6xHLpvGBmKTcYBsnMLfV4kweORxT1135wbd
+JQx0LQ2YWkUPsYsqEDk41GcnozQM0vh7tKLDbL5t52Td2HiG8zHsC54hoOLWPhGe
+Sy600hasI9Kp7+YOonSwGF6L3LsIPCU6+PLAIyai4f2x/k4wSOtdjVIUQnetKj4L
+cWFPHN1svknp6+ltD950XxrUGw8P9GSRSCmHs4UuGPaHZ3x47Eu0GUxUZQ/L21YC
+SoEGAUuFBEsQSMOrKizshNakIYSuYweGvJ6RPebI9iZaYYB8O1yc+ty0vDS77WRk
+LmS/03lZ9EmtLzTBf64IyKraVI/7apP6Au/QDQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/has-ou.pem
+++ b/security/manager/ssl/tests/mochitest/browser/has-ou.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUYW+35EKx0sSurkKvv/1DgHyPXs8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAgIUKfM+YBuJULDsdOeOZJpqV4MtVX8wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowKTEMMAoGA1UECwwDQmFyMQwwCgYDVQQKDANCYXoxCzAJBgNVBAYTAlVT
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB8SKOCEzGgRAI6hGPYfwSdRbws38Kl
-6ln4EcZ4QkCpfQkhfDkcZBGRqu2LxgqbLD7V5WyWkTTkSOGT8L0hsDB0hyJ6aka6
-yVO3qMfp6lsXt2X/VzHrgghUhSR00CuHuIi1wT9Yfg7KAVC7+1uaILtByKNHemri
-YBESxfMy1BK6O9ypZig7iXL6+HDMalVJjB8wPISGoY7QEqtLfSjzOIZylxZMnFdS
-Wbk5IIXo1sTotro1DYDoikwSZzYF4VehKIrtDqZGciRiIgZBAC1Ml8X6hDC+fFXX
-3+Qv8ltlpWPoMmLEl+th1g1PxUFThw3iFteRk3er8DmJY7p4mjnbq838
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCdE8t4WMgGVfNEx0zKmdAg61hRELCN
+NX2Viusz0i4JR0GY252EtS2+dp1o43RbXECUQolNIRHVzmW2Z4P8ZBld7LIx69YG
+7dB2OifkUcIpU7NKNBlQejXZWVXea+WvTnfE0p2JHt+adDgHeHhLgP8L57Abew/n
+qlR6X2OtNTj4XRcFAOwVPHPF4HYbNtMZUtXkoTiALBjP1g7Hni1yqzuOXl6+MPKN
+Dvbtt5e0t81jjS6oaObToFyrfZaKOIL5A3V2+IbAtV8wFXnL7NfFCkb1zkWGh5vI
+9no9HGrPhidmlL9mpFJjwRZ8WvbCVS0s0PJhzrF2xj/Ki8xhV6r67tig
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/invalid.pem
+++ b/security/manager/ssl/tests/mochitest/browser/invalid.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwDCCAaigAwIBAgIUG5nvQVSYjt3TaWWUbZdWD7yITVAwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICwDCCAaigAwIBAgIUX6hYVgYbkYkj3NSmkChhzCtLIAowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHaW52YWxpZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4IBAQCKc4ETEHo/oYvNXCv9GKNibKO5x5xFNcLI6DKf
-3yJNx0WsTm84mCIOX+MahVtnN5/8PThEe3K8cU4yYzUPqY29uW31yQQ9pBGaa0hP
-EJicXRg0JTOD+sYdO8FMWba7DfELgXjWG8C+vYwCgU+dqYpqoEpxBKQkhmrB1Ltb
-GjYle7wtYzzJJdH1uLNwi2+EQ8+ePxtEjKhHIxPkLvwRI5iSq7QToxb2H1lg8aNS
-0ncrl9ir7IxVxGovPUBtfwVS5lxCbZ58K5nm9kGZ1cZ1Xnu/oG4SiB5KQ90ep7SO
-ZrBzI/77yArCV5NgEAPVGvUEK9DzZYLBPmo53VqvD6xw8zfR
+MA0GCSqGSIb3DQEBCwUAA4IBAQCdKkWSnjcfC+AMv/E6XOtZlEa4sE4ablTYSC6s
+Tzrup6zOHR/oa+RmIexl/YQiKWwv2aXgZWE5mQTLAY27GBV5rEuqGcGta9cMnICH
+zsczNEtzJTk5+wrqM7dcH0aCeKpmvnz4BXcYq5iVv5ME8cnfMQVayfCD35SkayIF
+YRGpzhtZAsaD+G5DeqhNqX7bjdyXFaAlgciXntwO3b9gQeZGLh7CqYPLFLz6fnot
+3DiiBWfNEBIoUXjCcA2O8Kk6mBJcx4H3BhKALt3VNaa+pyxduKgG3k6p1LFCO7xD
+GmMGbY/YmWpFAYvT7vd8Y99Iz6F/Fmql3BFgaX1CS81ggcRP
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/longOID.pem
+++ b/security/manager/ssl/tests/mochitest/browser/longOID.pem
@@ -1,25 +1,26 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIESjCCAzKgAwIBAgIUBW5YWE9tdhJR3dTDnvsRcAlrmZkwDQYJKoZIhvcNAQEL
-BQAwEzERMA8GA1UEAwwITG9uZyBPSUQwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5
+MIIESjCCAzKgAwIBAgIUbyyEZ0uefPRu5qYMj8TPUySeh0gwDQYJKoZIhvcNAQEL
+BQAwEzERMA8GA1UEAwwITG9uZyBPSUQwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIw
 MDIwNTAwMDAwMFowEzERMA8GA1UEAwwITG9uZyBPSUQwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
 KZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmI
 YXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7fi
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjggGQMIIBjDAM
 BgNVHRMEBTADAQH/MIIBegYDVR0gBIIBcTCCAW0wggFpBoIBZSqD3OuTf4Pc65N/
 g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zr
 k3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D
 3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuT
 f4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc
 65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/
 g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zr
 k3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D
-3OuTf4Pc65N/ATANBgkqhkiG9w0BAQsFAAOCAQEAM7b4Ft7TfQ4SnRHqexFaaFsv
-JUEMiugi34ZRdQ8cyAwtq9HczM7T/3Y+fwLKd62U36LNs1XVVKDjHYrnvFbhFGMg
-F94Cnx1iO8IJ4ShZN9KxiPQiW1kmkOMDCsq2PMSJ2EiK+zbdthxlSEnQ7fnJeObX
-mWWruNf0MydPdru0N9Wnr7J2jAZiKZsH+UL+OqbJOVayFF/hExjmpz9LirHWvrrJ
-FOk828lCozLWIFpPTmcTdnX0R7Lns/b5eEHf3wptNTYXiOB2VUo7UfvDI6yDWWaJ
-Pt8d9qUZBxJ3ePdhAtzA01atlRM5VB/pwkAtTmMdYfEPWvVMVE5qGT4xRR6MtA==
+3OuTf4Pc65N/ATANBgkqhkiG9w0BAQsFAAOCAQEAIlmYqCOe5OQTfCKlZmMN8WST
+gXlWTo007G7jCQEI9G7RQzqJIpGjtFz3J/suUrhVUbdVpnLs+2dI6a4gZg1hLw4e
+1dSVyym1kqQ3wTpAielQr3u0d9xeJ9mk6GAMt+L8ZiMOduPXRcKC4kBIUvn/VpHX
+n17ULIHE+0iTRUiL/XKPXXCFYkeqV9/KYdIocZPqBEGrBxABqIWTn24IyiWZZZSH
+ptr/v9Rk0A5F6LLgpcar4zL92h9o2wfnQh4rRzKVlI6bUq5bKOSOvYqxXNpdowMz
+G8memyaOAMskMuAgY7qoMiuhspA93V2A2peAFYYRhigX/96Qtb9WdzbXz314KA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
+++ b/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICrjCCAZagAwIBAgIUU/hTPQcGWoXy3GKnQ81l+rRlsDowDQYJKoZIhvcNAQEE
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICrjCCAZagAwIBAgIUOfSyWbneBGYIKVUcVmEVtTXDvZcwDQYJKoZIhvcNAQEE
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGbWQ1LWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEBBAUAA4IB
-AQCeyrvP4//jinXjumHfZkm3goeR7mrDvjfeGMNWFP4VcdwazsnfyCL9JgmPCE/B
-MsI5E1nLuvrz8/7PO13SXY2avpLd40tvmwuzqRZicd5232SPE2wn6DL1K+OKAx4t
-8RS4JZMoBCo0tnhb8sll4E/V4Ddf0Z3tqB28GF/4BmXyTtJpgC1yD5zCQ/mlN8Jh
-i2HBe4IMqPvJheZDI45ZPGiGvlph9mvD0ivuJXd/FTxESN+11Rxwc3+grG9FQqXB
-Jb9iGhdR8HbGNMtnG2lrivF39f8SKivPF+oXL9Yg85bfoaUtcpfXSKl53mYcCSGT
-leeLVSdg5BqfGbM2kfn/wqVj
+AQBxTVKmLtPwGPnp+kxC+p7LlNDIUGb+6BeIReYn8BRR+GHX6jVEucom6E0jq0Oc
+RzioT3CeBEaY6MC6LUudZ+PaHqlDQxxkEPDsCwVN5M8I3JMuJlW7+xk99rXX0f6Z
+ZGMAVt0/3vv8c2ihMH56/1V9w6HSndIDMytMqBQT6ySgi/wwdckBGMNQCO0kHf7H
+/n5zK2mPhTlnu/jA6M1FCAOW8MIo8qmB2wkPSaF1atJVbW7OazT7tgfBRr2RZf1B
+2hE3WYYNd2tBAMY3kMTon1iIUk57gQ6Ysp1GQScl3b8hVA4DgOgbGv820KhtEV2q
+R01fyvDp9SrqFIS0pToRURWK
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/revoked.pem
+++ b/security/manager/ssl/tests/mochitest/browser/revoked.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICrzCCAZegAwIBAgIUAexX/VAij/FadQTfWaoVxsWhijowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICrzCCAZegAwIBAgIULRJAH5Xpb9hLoIKxwSQKNqKhIwswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHcmV2b2tlZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAcut7cU1Gk+CnDQZPw5lI2LYBgK/m1NIAVQwMXTk5KQuZIVNuWxJOPkcamYAz
-s69bamng+kmREcfTXzLZDYBRkDIzFA6xwW8ircF50ZG+1MROPvKKizZKFwJkHhsu
-375E04EqeerZxAys6rOfSiNAOSaEFZR0Sr+9Z1RIHBYelAsNKUZNSr+gShC6OeYc
-Rvlnzn0XFHFMZQSSv/PYheUjAzNXbXXOGpbQVHMZ+OaMNoyw8Gz38VyY/WjBERDb
-8KeM6xXQePUmWbt2kYrbJbVV3BBZpG5LEcadBfKlvc211g9Id/eRtit+abA/lqeo
-neK2vly8NAPsX+5UIudhpYBfBA==
+AQEACb2LHT06TGb2Wriha5htUofxAuR2j+GZi/EEfIVGLJF9nIfC/8kZr/aVmLee
+Bxm6vFilvcqG4amZkDG2lrlpg5NKOaF9ORj75sU8CMRGWfzBpUsWgIgj8s6R3ehP
+DgaPj8mYcdEDJsSdpjVDrFCuWHawuIANLzEB3iv3OmkREMSIeIMLZv3SPkuckSJw
+jAIIVu+osxDccuplP3AL3HgDxbmg79K50BzTV75/UKJyPV8aVd3f8j50URvjFcvu
+6CI6xsreU8fQ8q9NzUF3p6TZFQEeSrXuVoJHTx5EV3mjQGdgByBW5pt02oSE6AOX
+erOX7o85zqwzW2FF7YfUsDY69g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
+++ b/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIUZWjEHOTKBXj3CIErDjijVvCn8PgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0TCCAbmgAwIBAgIUT9zh7ezHT+Ld6l14wlJqW6VyMgMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGc3NsLWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyEwHzAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEjZJO3mQvdMeVqc
-zOxlh55B4fhlO+Ip++93gTjFo3vpTZafBZE7vlllgReI8Ep+++YYX6ZuxhLVK+NW
-uB7Xy4KyhWJpw+V02o3jgKanU84mP87LCjaS7k1dFtkBix4jNOrvINgjZmPxDWoX
-Va09o7cgkbDPSgAHFE4Pl1Ivk2AQq5+o+7fi8DapobXBRlJt40Utb2ad5Er3ligz
-1xDFHNLmFe0amM3rjpbWbJ7Su6LS9Qu+/LCjpfsVz0UHktqMEgjV7W++XYPnfbc2
-3fC1reFFjCgb53ub1R2XyDn6N4XPEUGMUR0TB2KXP0KbkrwdfWfJagovDN2Rr+XP
-WW/bQ7w=
+BgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAGyREi/pf+KtWosM
+dKiev2zUJLsBe2wzHuvQE90vKf1FcglZfI4kmVVGuQrZJJsVvQc7H588HgvMCVwD
+Po75etnWMJYFLcTCa6fWzQfc936cS58XXS00ybAL1BtaJsay2rDsnNRjZOxEg4H3
+PnlozA/4XSOihwn3hkZ+bPquORRl2VVJx+8O0b4PGuE4hfyiziuirWAH+m/bXORX
+ZYX8xWLi/Ba/6k4mPkteHZPk4repKg75be1D6rUGjF0arWoYvvovN6ZOhNGwGiam
+o16la87MArJn/7aIIv9mjOWHq4BM3K3i6dkSz3GSS3xOAk8ePE42zWNUSIqvduQ/
+xjkUAUs=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
+++ b/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuzCCAaOgAwIBAgIUO2qYgqsXsPccdgTQCwMeab8tGtwwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHdW5rbm93bjAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIICuzCCAaOgAwIBAgIUFxgpdam1rbFIsbTTC8WFXHjFayswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHdW5rbm93bjAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAZMRcwFQYDVQQDDA51bmtub3duLWlzc3VlcjCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
 HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkq
-hkiG9w0BAQsFAAOCAQEAJSAl7uabDP0yUA1Aa4z72h+WB1qWMuseHhClBO8ky9hz
-Gwd0nbRbSTXpScbX0UH29vmMTF8t7rYNEWrw8z6QeFHj7VXdYVx0J7+aKjXXgl6B
-JNeHpYl0qQv8NjO55hXCedUBQYb9oQ9xqjhRhtokgG+2nRHuQ81yvUBLPpV7WqKz
-xd7SDC1OKJnphXuHF7F36SO0vmn18WKkuGbgpJBVL063BHndOvyWvTo31YGJaik4
-BUYWvRfEryFtxzKiNS7f4jfVJLgq25XZV6BDsuRMKEuNVapf68i0gvAHKXDXTY4n
-OiGGIRx5MCMDBfDsRIrDbvti+KAsyQbzH2qvpDtozQ==
+hkiG9w0BAQsFAAOCAQEATkVCpK9Q1Eiy/pOh1r316G6OVKj0yZEIxafFWZCxEEnA
+uKHaGY8Eb6oKCAzflU04ZU2PuHpE2cnd3J+phADwfqf+hczU5oI4FuPhvUdi6uE5
+otWkKV5KDswp9la4kvg2X2i5Hfu0BBfJ8PRkEF8ftxPOc6sNohyHqTbZSjlJAt5h
+C73CGiZbmAFJaNYkXz8iSeF9mo76qn8Fivt4oaCdpikQhjm8zef/av8FCAt3I1B1
+DTJJ/bFkfRtOQ2gDr5vpS3iw4BNMQGn44sjWZeOI5zYZtbpwfaPS/x1x56kLCpWi
+5qXSO9O5X6U8nHVKe23vf6Il26zfbkQYvl9hVaL75w==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
+++ b/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIULQ10ysBI+ay4wdZyynvgITsqgRowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0zCCAbugAwIBAgIUMZWL/oQu4rHohAyqNBb6YQEvZZ0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAokgk+BUnUY0j
-dMDrak2P4dy/HvenDA/2LkauDl+SL/fNy4K5x/UklgdP39QusFqLWTLsn/COyAV5
-rHeZsxg0rnKwRDNq3OakW7fOSNJUtGdp9tb+HZ/Nti7aJo+K1xOOfqP1kp1f52Ut
-UwHBfuUS95BFZan312b/XrX39tcPw84ow7EC33r9YwiaP+jKNB1NKjnWa1sQC2vf
-d0U8xDe2+u7JmMl/qxUHHFQ5eMXd46gfdCBxeIbJkD07H8XqghXU1Y0KmSHz1g4j
-ldRbo7M0OvURuqzescG1tZfJDlarwOPKDpzl4rv4h/xw6rc2COWX+ehzU8X7o8Fz
-a8p7zRsG7w==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAH1QJvOn7qKmh
+0SSocNCzAJFpXKlF26k3Q3QOtaR91Unwo/geU7ZvQWYqsgqoWaeTFpDRZT/AYiws
+VShyJjmx7B+x5Qxaxx0+pit9MjnKm8mMVBDuYLmENitWLzZ+lbOy4lMgQUBQAhPL
+6+FPc2Hnz4AAhgWvrehzGPPbgcll+wH0gB3Y/dmdX6IE7orTAC5KgGRydts/X/br
+UvGj7gyeZbT4mTM2sQLaNb9/jOpS76PyoEL0mEQd5Xayo7dBOZK+0J4gkMZ14HOS
+vNUlg3pfUADBJok2r4fTvzfTfSRbuIP1nE02NzIsIYarz56O5tF8eg0Krcf7xFSt
+oL171jFs+g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC6DCCAdCgAwIBAgIUd9GvQ+GmrpmytGy6L9w/IOfSu8AwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC6DCCAdCgAwIBAgIUDVBOAF1ClNXf6kk9g8W9CwCVt6cwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAmMSQwIgYDVQQDDBtFRSB3aXRoIGJhZCBzdWJqZWN0QWx0TmFt
 ZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
 p0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB
 7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4C
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjHjAcMBoGA1UdEQQTMBGCDyouKi5leGFtcGxlLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAlgHTpYcL5PY1mZnHZa8i0rFPm4TTFS+/UWULX4KeiCULfYv8
-OXL9Qv6EUOmlx9X7cSglzpW3YQeHPPjpbE3sJaRK7q2GfYSghSvfo8z8c3phoVMl
-hF7qSyAY1VRMntlPZQBJU86KS+y8x8/8ivGSJVPlSFTOUwElS9sLIPKb4WEz9R5M
-ZLDBV/jeWOSgoAV/S8GmeGq8pMq7LhX97juxmuyXRzz4hLSPnl9LuKlZpstvFCkX
-Ix9o+hlXv3wPp4jDURaaz2GTzmO9buibbJKg75D9aDoAlDVVLZ3q4xK0uTKyvm2h
-cK9ZTB3Z5qmHnfE7hCHHGvN8/A3P50rccPFktQ==
+9w0BAQsFAAOCAQEAEpJycfAaV6bGYklc9oHzO7t/Phj2WFS5pDggZ8YR9fhkRrdk
+KSpCqVDzMwsIYjyBXjSleKzJo8q6uWwrrw2Mh1TfonpNycQzQShVFpnzZU/9Bskx
+SAdI7wYolG7P3hQGDfF2qmtAU1qD83dPA7/+OwpQ4OqTgSrK7W2pWToENZS+4ieb
+GE3Xe0t5YwZOE0JkHNAX42ABTZ0cjupuUafe36T5EUOPsUTbUIsmiyUkAscsU+10
+tdiDa278+UoTGvkayv4sC65r+zLumcs2M+benPqLQ1BANsvcieOmToiyS+1fgxFp
+uMIFl90ijzmI9rFNYXwagOKAebVXwt4HjFeRlw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDKzCCAhOgAwIBAgIUPU/rVUoMybyCeEAWx++fMAuZ6k0wDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8xOTQ2MDIxNDAwMDAwMFoYDzIwMzEw
 MTAxMDAwMDAwWjAsMSowKAYDVQQDDCFCZWZvcmUgVU5JWCBFcG9jaCBUZXN0IEVu
 ZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W
 1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtq
 ZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx
 0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthV
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC7zCCAdegAwIBAgIUL5tQyA2FR4V3eMcfGyWTxS4vmp0wDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8xOTQ2MDIxNDAwMDAwMFoYDzIwMzEw
 MTAxMDAwMDAwWjAuMSwwKgYDVQQDDCNCZWZvcmUgVU5JWCBFcG9jaCBUZXN0IElu
 dGVybWVkaWF0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahE
 jhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1
 a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1p
 GrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIUexy7tYqIxbyV8LYJ943oTxKr590wDQYJKoZIhvcNAQEL
+MIIDWjCCAkKgAwIBAgIUB6eeMdb6mEh22JoOEZ7vkofu3YkwDQYJKoZIhvcNAQEL
 BQAwLjEsMCoGA1UEAwwjQmVmb3JlIFVOSVggRXBvY2ggVGVzdCBJbnRlcm1lZGlh
-dGUwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAwMDAwMFowODE2MDQGA1UE
+dGUwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAwMDAwMFowODE2MDQGA1UE
 AwwtVGVzdCBFbmQtZW50aXR5IHdpdGggQmVmb3JlIFVOSVggRXBvY2ggaXNzdWVy
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
 jQIDAQABo2IwYDAqBgNVHREEIzAhgh9iZWZvcmUtZXBvY2gtaXNzdWVyLmV4YW1w
 bGUuY29tMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2Fs
-aG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAevFiam0l75lCGEsI8AL3Uv8T
-LcQ1sU9PUOP6HbfHS2fCjDP9QLI9iP4e9XRlsai5PT00QhSR6neET5iVyD11VY/Q
-QuAtDlcfTRCf7nBfOwxX2CK91DfuYcMAVdwB9WszaO6z1gXeXoPT2zXtRgPHtCwI
-VEl/LfZE8OKXzg15tjqtXbBLT8YjoRnWmClv/dEeAEbWPOaWwk4xGrdpfHouQ63S
-KlVS2IuOPGXMiX8yoLL1xIN+RWihlHDDBFIK0JVhxRnF2rH3zck+cCSdQKQwx7Rh
-MOcVrWCBlO2BPXQktgThUZ3d1rOrH7MPA9/DLJskRL4IoKY0EzFlkvY7NhBt3g==
+aG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAemI67hV1kGfXAayRmHExPwDz
+zX6/ajpuLtuHUiHPaEBlsJJV0ciYQaS3HunxeEJeuW4zifIVAgh46br8jlupnaNS
+MN0DBhvRNLhxgCLYdvjkRRKzigoYwgO2WRCCPf0dZ3R92TMyhd5NIdHeXd+ciOni
+gc8nnFGWRKbE3B5/Wd5WSbwJ0liTeSbiioar5cVJPIEoYgVYJbFiwxMeUqoDNmwn
+4wcSgJwVmtW7zQ5KKXASRCAa5wxL88lS1kxB0qFAw+NGORbslRAJrX6Y5LcoDXqR
+PpRVmqaZ+MvvB8IGqAwqNZ5vuFyIkn+LzrfGlHE53ZHoydwzjad27nmZEcYOiQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUcYq9LyATGOqic2ewPbU/ayQ89vUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDRTCCAi2gAwIBAgIUb2J60U1tcE6yv0N5Nc0fd2jiMRswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
 IEVuZC1FbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjcjBwMAwGA1UdEwQFMAMBAf8wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMCwGA1UdEQQl
 MCOCIWNhLXVzZWQtYXMtZW5kLWVudGl0eS5leGFtcGxlLmNvbTANBgkqhkiG9w0B
-AQsFAAOCAQEAY3TYjwp6cbbiSuVCf/VI2necDDkvOFW3qwhd8YDxwgbRSE0LhbGG
-YHzM4C1fXlxBg1HCFUmbjBYDc8ZMxcr3SNHjpRbDxYd8Gq3NvVQUHQZaChEqroln
-PYgYY3s62s5KxMgd9PHPAXXDxm4poDYAU227wQLPepeS6Jfk0Igz/h7v0ThP62Ei
-e/mYVJXHO43VJq0U20FosJpz7qXD3nwir4z22y0JKHg9AV9pmih7xcyOxEEWJSVm
-VkfM4n+Xgm53znFiRY12LzccMV17vH6jeq1ywkOIEv59pHl42/cYeMHaodth20EJ
-6KSnz5xBmaXfGEngKEwm5jljidsqor0wPg==
+AQsFAAOCAQEADiYwmHSjgonXvA0uBWkG0o+D1z6DrDMWDAG0qIcn1H7JLMzF38TX
+4ytWn/NKyN9r1mNzl0dRBLja1SMUDEAWARtTL9CfHHDKvp/yaLySaZ5SHgqmNZ+B
++av7Ql3UStWtu8yMm4u/wcguJ3G4SUFRWWwwQ8Lw9gAi+J5LfE/3Pv5bw/QDovNI
+JhZb71sdAx0FOEfroPR04QUd0Nbt1GxtomVE9EDT6SkcWsJ65zX8eOblAH4f/J0h
+7LIhWFyZv3H4dRqIMvX8FZrqvy55rjEkyg7CYhVgnOoPZ2dhTt+mTmqqqc76rfj9
+pamqv20tuRakf4GHYSZVWUrh2EWFnVrZNw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
@@ -1,21 +1,22 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDiTCCAnGgAwIBAgIUWbWLTwLBvfwcoiU7I8lDz9snfUgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDiTCCAnGgAwIBAgIUDUo/9G0rz7fJiWTw0hY6TIyPRSIwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjgcow
 gccwgZAGA1UdEQSBiDCBhYIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tghUqLnBp
 bm5pbmcuZXhhbXBsZS5jb22CKCouaW5jbHVkZS1zdWJkb21haW5zLnBpbm5pbmcu
 ZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5zLnBpbm5pbmcuZXhhbXBs
 ZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxo
-b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQBE+6IPJK5OeonoQPC4CCWMd69S
-jhwS7X6TNgxDJzW7qpVm4SFyYZ2xqzr2zib5LsYek6/jok5LPSpJVeFuSeiesvGM
-xk0O4ZEihPxSM4uR4xpCnPzz7LoFIzMELJv5i+cgLw4+6cINPkLjoCUdb+AXSTur
-7THJaO75B44I2JjJfMfzgW1FwoWgXL/PQWRw+VY6OY1glqZOXzP+vfSja1Soggpi
-CzdPx7h1/SEEZov7zhCZXv1Cenx1njlpcj9wWEJMsyZczMNtiz5GkRrLaqCz9F8a
-h3NvkvPAZ0oOqtxuQgMXK/c0OXJVKi0SCJsWqZDoZhCrS/dE9guxlseZqhSI
+b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCkguNhMyVCYhyYXfE22wNvlaob
+K2YRb4OGMxySIKuQ80N0XlO+xpLJTs9YzFVY1+JTHNez1QfwP9KJeZznTzVzLh4s
+v0swx/+oUxCfLb0VIl/kdUqLkbGYrAmtjeOKZLaqVtRH0BnmbPowLak1pi6nQYOU
++aL9QOuvT/j3rXoimcdo6X3TK1SN2/64fGMyG/pwas+JXehbReUf4n1ewk84ADtb
++ew8tRAKf/uxzKUj5t/UgqDsnTWq5wUc5IJKwoHT41sQnNqPg12x4+WGWiAsWCpR
+/hKYHFGr7rb4JTGEPAJpWcv9WtZYAvwT78a2xpHp5XNglj16IjWEukvJuU1W
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAeegAwIBAgIUO7ikypeCrLrhjkqhSPfvqONx6+wwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUTWlzc2luZyBJbnRlcm1lZGlhdGUwIhgPMjAxNjExMjcw
-MDAwMDBaGA8yMDE5MDIwNTAwMDAwMFowJzElMCMGA1UEAwwcZWUtZnJvbS1taXNz
+MIIC/zCCAeegAwIBAgIUCeFR7AssQr1nXaLSroLTbDiP6wYwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUTWlzc2luZyBJbnRlcm1lZGlhdGUwIhgPMjAxNzExMjcw
+MDAwMDBaGA8yMDIwMDIwNTAwMDAwMFowJzElMCMGA1UEAwwcZWUtZnJvbS1taXNz
 aW5nLWludGVybWVkaWF0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
 gg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g3
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
 /kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMnMCUwIwYDVR0RBBwwGoIJbG9jYWxob3N0
-gg0qLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAk7VSvlBxhRyqbgS7a
-nhNSw4eWRHdLEp22gfUxBJiraqFxzRykz3Z3AK7Lc4ETI0FaOU+wOz3amXveBL5o
-MrkL2At4Db4VDZAiqYmR4xamc4CZBGVnvTO36aos4qL16j3hD8p/Mt/hPuGuQ3u5
-p+WAORTLnB+qVxmIWyHl4VrXvvxx8za+R1AZMZ5L+rYwNooDAL3AFSs+x9zQXWyR
-TH5UcbTpI/awyE8o6EXGvDbNV4bIOvavyNjXrsrrOJgf/q2IXRY/OdpyZb6sGoJX
-cBithKP9Wu+tLLY12i85QyYOJzOpx70Ic4w13iBeSuGKxIKhgTUNYMUiQ5Us97ag
-NPKV
+gg0qLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAs8iUJBPdVkxsOoHua
+yrxCUbuNVgYJ5CjLBfJQQtHcjMGl5W5LBFLh9oVFAUKs6jKzuFNOqghHuiED0jSa
+QYm2uvI+wiB4CF8/trwrNQUyH/h7RJ/7rPIhJ6JkpuOM5aktr9+8SN0841SfjzmR
+0kCr97YajNlYHuiscHns1sA+m+OhyVZafNyiSFEUAIxzdLfYv0tgA7D6mZ7fYXhU
+qJypvP731vvpBXQUKWnV2IBss16REQfr5SOrE0YJkejd1JpiOfyIwuOCv02uYDS1
+1qyLPVauJ44vafkUzoavzXl7P/RfBjt30j01nlYskUIjYRLA5qpYxgHxZrFwHiMa
+AEFs
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem
@@ -1,21 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDPjCCAiagAwIBAgIUBfMdgOrncol53tt16EE4flETpVwwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDPjCCAiagAwIBAgIUXTQEIrAmvr3FqlRwN8M1r8BzibAwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjArMSkwJwYDVQQDEyBJbW1pbmVudGx5IERpc3RydXN0ZWQgRW5k
 IEVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
 AjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3
 ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jh
 s3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHV
 A6zaGAo17Y0CAwEAAaNvMG0wNwYDVR0RBDAwLoIJbG9jYWxob3N0giFpbW1pbmVu
 dGx5LWRpc3RydXN0ZWQuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsG
 AQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IB
-AQB5mcAyrmSdUxwgZEe8yM2ERG//SO0aGavM+xpMVyk0Pzje5iRQ2nMWpjpY8QWQ
-bfCs1d80XZ10eeJoUC7YvA5EbNk4JUUlIi4NDNJEgazrfgDfpBwDrVtdVUTt7m0J
-wI6n4UkCLRa6A9LzUuujh69BbU9C4XK9xr/4sRdp0o/BS7M3MCFwgGttXMKQ1+Te
-Goo24jV2Jm+PmcBYnOn4yyBZM1+oOuwBdvaNkTI8zaO8W8gfcuOni5rgUUoW0ycD
-XyMsUlXEKdQdfgl5j09Alu2IQaSw09pJlulbqp7h70QDDUL8Lkh0IjH6vkdeArHM
-Zn+daUiyU4fU78KVZDe/vyWh
+AQBNYvexOLbTgxVzlV5xMKexPvxwDlPvPBSwq5utyf2k0rsYDdhs61FNd4j2B+0j
+fYY8iUs4mIL+Y3RPU9K0MRlzgHNNqSNNiWAt1fCnRCOSKWTpw/X0GxL00CmivhiN
+QMXCNnDZUqen7lWdsnOKRsjD+s93chlld//B3FxF2I3YGfWBWY5VMvhCt5IR9Sc3
+9ClSt3eX6mB6Uc2vVEcLJjHGlKTmyLPb8rpChLckPvvSjaEgpEQTG4xo8svGEfNZ
+jf896aKn7GswRkNqIIrgdJSJ3b185Y3fizFudrEu4nsfw9Pub3de7A2QtN+akdNL
+p0MOxEupRkoHlwUFN0/eNczu
 -----END CERTIFICATE-----
-
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDJTCCAg2gAwIBAgIUQ6fshHgq3x2If8ZbagdM/YfRBgkwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPVGVzdCBFbmQtZW50aXR5MCIYDzIwMTYxMTI3MDAwMDAw
-WhgPMjAxOTAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME0VFIElzc3VlZCBieSBub24t
+MIIDJTCCAg2gAwIBAgIUL/LtXZ+Jcb8AFWu1Gl2tEwSWcSswDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPVGVzdCBFbmQtZW50aXR5MCIYDzIwMTcxMTI3MDAwMDAw
+WhgPMjAyMDAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME0VFIElzc3VlZCBieSBub24t
 Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
 p0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB
 7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4C
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjWzBZMCMGA1UdEQQcMBqCCWxvY2FsaG9zdIINKi5leGFtcGxlLmNv
 bTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6
-ODg4OC8wDQYJKoZIhvcNAQELBQADggEBALif1aT7g23ISTqJcEVL40oVDoQbI7Ad
-c4PUh1WNrCAqZLEZ6xVPetYWyoyhs1etDuV/VhJIP4T2uYNmetpJmKlOmOCVt/aX
-YA63S3MfIgKNUvMj9ShnVFzHWcvD+tV7sNBHKVuPnZ0AqJ1RwV4V+nLD0vgOzLLn
-oq0y+sT8O6fnOTw/WDfgooKMQf/nsK6jSg5mJv8WBl3CflarUtuGC3EIbpW75k+0
-V4NY1LS/OR0gdDuVR+1Ty2xbUcaanOrGD8alzsRKU4VTFC1q0xqqim4SbOqfqIf4
-TK4JhtBnMr4GjY7KUl2Vhg+ZCtDAE+KEAMFSVwO7e3ep9Ff1FHp2+18=
+ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAFGu1XV/Jw05G3wU/VUzAkVHBaCH00UN
+qEIuZrsyL+z42W5IHMuwNrSjeX8CZmxauH0+Jd9hctpfjh/aN8YmKFFQm9jlzku5
+wkb/HkN2Rv5I7+2FtFG2F8ZyGP1PfC+DJH9kEbLbaNaBGdWGztUw+wn0Fkx20c34
+5h23WQbbVKrtzddcXFYrIJIgeIadnirajEsMBkN2bqlgViyyUrMW9+i84f9sD3nw
+v3oYkY4bUHONQFduQxWY74A4qJfGWnBef2vhGoTVJKJ7oLMAY3zSeOAF3q+fQ0Bj
+3aBugi9nOeXkg6J8bO/HPuLvGWt23W7sxJr4cG4Ty4DSBjBmDLfr1xI=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC6jCCAdKgAwIBAgIUD8HXNzNJNN0HBhqGSh/sV8Mn57MwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVjEgQ2VydDAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC6jCCAdKgAwIBAgIURQebXZNtSm5jDwikvJ69OQPBZhEwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVjEgQ2VydDAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAfMR0wGwYDVQQDDBRFRSBJc3N1ZWQgYnkgVjEgQ2VydDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
 /WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAG
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
 AaMnMCUwIwYDVR0RBBwwGoIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tMA0GCSqG
-SIb3DQEBCwUAA4IBAQBElX7MVSmm0/4FRIbH+H6z+AKIFDi/sZ8sjQtrHJtZFWZX
-1Td9ybUDA+qCsPvYfqfrpFdxe9bkY9R+e+lpZF9VIDkg2aMKIqClaFNqtDj7CFdt
-v/V59fYY9oN+J1RkmfgEVnZZVnejoJVl59vAKXqGEcXA/7fIC26OA+PFtpoAwN63
-M9IgeOa3zx6xKoq67jA6ReHxvTL3hBFzA0bVDUU4Of33NNraP4Ttm50IJnVL9cta
-OEERAqARW11BBw9ff2dg8l9VGIH1gvDi0zZrnNgQYlELlyhW/fX3L3tTjRGSjr26
-pjTJ60cvp4QoXgnegPC4EvYyPr/ERgLx7kmHMX6v
+SIb3DQEBCwUAA4IBAQBXdKI5motLEkvIfTITg/7Fl9ZaRgPIVXaHnYKyf5AVcZz1
+z4Q8AGRXVsmehuCCcJMlsxuVPT3E7EEPkEOWpaG+sgOIQvO8hGOmWBRGuR7ySx2+
+AFsJ17sJUFjj9h9bDrYC47GSbVBmCi3B/Tu0g2Nh5ra8WkYVGdgho8ahkzRYh4TE
+VngTWuoIfjckDkAKaNs7/GVQaKyh56Wzo6jvfs0aAekRCINiZUu4Upx3v542jxb2
+t+IYSJed2BQveIGRzA0TZGr0A5ra3DAN35d7AhCsf8k8RSE7Pz3ScT7Q+Oh+VtR2
+M1KnvWtDOJyNit0DtV43dxXjE+goUYODGk+d59Hl
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUdf3pdrl+y/w4EsscS2PsdJPOMeQwDQYJKoZIhvcNAQEL
-BQAwADAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAtMSswKQYD
+MIIC6TCCAdGgAwIBAgIUE6wL9bTtoJFhYyjKy3qkjpCh9yQwDQYJKoZIhvcNAQEL
+BQAwADAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAtMSswKQYD
 VQQDDCJFbmQgZW50aXR5IHNpZ25lZCBieSBlbXB0eSBuYW1lIENBMIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVK
 tOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7N
 Q/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39Zgsr
 sCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxs
 l62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYl
 nauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyow
 KDAmBgNVHREEHzAdghtlbXB0eWlzc3Vlcm5hbWUuZXhhbXBsZS5jb20wDQYJKoZI
-hvcNAQELBQADggEBAEaOAH99Kg9IqBorCt4/YWWh8zH4ouf5pOEH0q5JkVkUefxZ
-g0HfJY+3HwsE5BdAcxkayfKUXvdBa50XWeWHVTZrl06j5uNU9xB9i2RPVnZlUfJo
-welS08LKNTVGFtP7yEid14vUl7/qkK3Nh73L4gY2DpD1jz4BVk/63a50/GZyjnmW
-ncsNhNHf/EAsXpG1goVWzn+fj6wuURlt8QynM5apEgRE8yDxqEdHoMXCgJTD2/0Q
-dO6Mun9BFgezk4Ny/BCQfCj/ISHdsuuqHcK89qiwBro62Bs/kVk/vPxkBw7Ovbgx
-PmXyKzvCglB4V0nCvagdvhreIv4GrC/MmzGQ7Io=
+hvcNAQELBQADggEBAILgtoLwrnGPLyKrilImXMwL6G8PQfqXV4InKp2zmnpAcEW7
+CJ9gZl1PxKQEH6Yc6y4v8NSmJeCJqDW5GtlcfG5N3JZh+DjhpYNhF+YMF8b96wCw
+wC9iJ4zEx6yZnkVxmR+mcDObFSXU0YnsSPymsbkglIeTe37iZN+1LGoHCZ5y5Ca8
+C0qZTkpOReKzdK8sT9SLeyMlIED9lVWWwalP1NNcNh21GaIb5vqpe5BOnwKlpmW7
+PrdVGyHakcEodCMOqCSgK2ikv3UEOdHJH9lkimkllnI0Uf1e+NbbnSRY4zB/lFyk
+nL4C4fGi6yj6Rk2ruljoj2HVxwHSsjhR3vXEV6M=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwTCCAamgAwIBAgIUJRYeJG+pSnHfBGyiamHMKT2by1kwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIICwTCCAamgAwIBAgIUPR9EWOPkxvwlOv+AgcFQqH+qEsAwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
 qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
 WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
 rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPv
 JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
 Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
 clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB
-BjANBgkqhkiG9w0BAQsFAAOCAQEAfnD5gN5A3SIuXnQMr547P02qxngTQIJ1MjZ1
-S374hHPFAU6ZX2YDQMopntd1UJXk2PZ2+mv0Fhrkyhb54K5sO3aNpxPqQJ6oiSq/
-rVi2LDiflDaJuTINaVojMr4hUIIcDeW29O18EUph7QmVMPt9NEt/kJcv31B/PSgC
-KXwBv3z6pqX11rdr+if7pMJemDQCNnBKj0rpTC4PvPOm1oyWAtPwsRaK58e1pUD4
-cdhB9rjwcQyXS0/Iw/QZvygsWNms4hlZdziJ1a59MGBny0bq11DG5jE69HqytUEn
-YHNDqaxU2IYKmmb+tK2+tnT/F9aUEvRk+clzyPrv+fPgZQxfEw==
+BjANBgkqhkiG9w0BAQsFAAOCAQEAhUyR5PmKHhXDNqclEAQtN/aXAW0iGJ5bz+xD
+bJa87LEfGLco3SjnYPROgIu7f96v4hKEofkXtrCHKUzwba3g/3+PUzERpdrFww1A
+/KUSoXuJ6Z+6C+9qGN+PGBpf57iTSyWtDKqL8qWkTqOhCS0U4ksR2y3kjCVLnWR+
+/J13Z6RiuAeP3hP7hB5d7rxtF5OlIsZzmxWaDCcRt6a7YlJ15SM1R/TXUWtg17h0
+/i6NssxQuzHxF7b2AU/DGoUNm+R1wEtNmC17keIznLPVm7OOkZgpbzL6xtnJiYOq
+z+TBp/m5MxsX9gCej/Jh90r88x9BaiwW5qrzVyxv/nNx/qPsKQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDOzCCAiOgAwIBAgIUb6G4smC/XFNtp83O8Kat1KNchwgwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIIDOzCCAiOgAwIBAgIUUf0jnbo9PAuG+eA4EkbezE2d7IkwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMB8xHTAbBgNVBAMMFGV2LXRlc3QtaW50ZXJtZWRpYXRlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
 ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYk
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 o3kwdzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBHBggrBgEFBQcBAQQ7MDkw
 NwYIKwYBBQUHMAGGK2h0dHA6Ly9sb2NhbGhvc3Q6ODg4OC9ldi10ZXN0LWludGVy
-bWVkaWF0ZS8wEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBCwUAA4IBAQCe
-8FUDEa+1mwY31+Un/3j0gnTT6ZRzmjCQOWR8+Fa79Zc8Deop/LwecqE5m8f8t9d4
-hJ71FhRZ/ZPDlwuZNKWsf+RL7nRHGmG6T8Sgfv8FMu2CoeLTymxDznjEz9QRotnQ
-4QkiHYhyPLoov2XizCZPmPqtBd8bF9orYkhwzz0BhmsdOWcsusgqu4669L0llt28
-5nVQN8H26GhcTf8E7LY0TeT6kq0xtv3pH9fi90r7Gv8PwfeAEIZAax/E4tlSHNCo
-9rGWjDFZWLO8xV9iRsixttW8p5NueNDYJYCld4D4hkQMZBuPbpRvFLRCkNldMvX+
-82WGcoK1sc9q3dUnnnNG
+bWVkaWF0ZS8wEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBCwUAA4IBAQBy
+ahlAkaMQ5WWsCIOPvNWYoChNAX7eB1zepY5lun0PJES342WvX4yuIstXbiVbFsNg
+OHU01SqklclhG8fV26vB5X7t3aVj5WPlWf12EnRjDKJfqAbeYn16NwawxX58g1OP
+hvllz5n7S7nw1pUqXNo5U5yPeT6ZE7k13Lk2pA/JVGuotbm5ge5jBgOtlH1KgYhZ
+ETNjGUv72ZewMEjNez2um3Xh1EqDToZ8WS3lqFeOqS59GEyIANmQetKULzQi1l7v
++9KeyYzG8sMDa0Ie+88Edi1QRjqE3TAIaHVR6v3bUP2ObGfqMQH/u6fehBLjM3lc
+cOnL1RgLmCAlgnL2UpRE
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDQjCCAiqgAwIBAgIUYaonsVKB5f9Im9L3+fVSjNmsu2EwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUZXYtdGVzdC1pbnRlcm1lZGlhdGUwIhgPMjAxNjExMjcw
-MDAwMDBaGA8yMDE5MDIwNTAwMDAwMFowEjEQMA4GA1UEAwwHZXYtdGVzdDCCASIw
+MIIDQjCCAiqgAwIBAgIUNR5oxJ/5w7DHt4C9lcJ00TX/caEwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUZXYtdGVzdC1pbnRlcm1lZGlhdGUwIhgPMjAxNzExMjcw
+MDAwMDBaGA8yMDIwMDIwNTAwMDAwMFowEjEQMA4GA1UEAwwHZXYtdGVzdDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
 /WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAG
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
 AaN/MH0wOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8vbG9jYWxo
 b3N0Ojg4ODgvZXYtdGVzdC8wHwYDVR0gBBgwFjAUBhIrBgEEAetJhRqFGoUaAYN0
 CQEwHgYDVR0RBBcwFYITZXYtdGVzdC5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAIY0UFsOQxzBWSQ0Se50Rh4aYhVmmyod0wXIloygOetIAvYt0Dq7s5J1J
-XiwhuHs/s6JCKvoIKRyQzBY0af/fpZUyjiIybXzOdhHtjzDh3BSQ7J8vK/IaBxp6
-TKO4Lo3fe6carLGaxyrq0FCHYGA3jDfezUXj0SDGp/2Vwh5U03VNHqbbiFgV9fgS
-Nm03bmnfg8L0XmaY1z2ivDxs4NREu+AZzMmAYE66RNQoUyTtWZQCHVIdfDqc4lbS
-oeSIELCxWl8sFgA0fbS6ABilennQDg+sB06paTWZqdfdepSRJdMvHlecQwHKQGpr
-asUja1SsBNyYymM2ZjJf0+juQNivrQ==
+AAOCAQEArh9qu7ylzOTN/dOvtR0YtDF2+JM1yuNe9Fqp7fALSGK1/9nq81piPlnf
+xEcgbIpJ42RjnhJFmRYgkSBscEIOVtxlkKUAAJVeUVMkzMEmiBoaieUippf4O6Dd
+VyxlDGmGMxPE0OuW7Rdmi1tO+8LzZCIeve0bPmJroFQk9q7W3GzEYiAAvmtCvmuC
+vx6lnZ9ofDYAB9g8NPOsV1/3Vn7AeSOqoiVF+jHOvQyctZE0YHb5gNJXK28cUDvp
+imr7lIedQIkP0/TcWzniPV45WRbbq3Zf+CvbJjr8rS6Xfkv2YldSyLIAJb283yED
+pfKYJUK2cdJcTH2cy3VLjdNMRLQIUQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/evroot.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/evroot.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC0TCCAbmgAwIBAgIUIZSHsVgzcvhPgdfrgdMGlpSfMegwDQYJKoZIhvcNAQEL
 BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTUwMTAxMDAwMDAwWhgPMjAzNTAx
 MDEwMDAwMDBaMBExDzANBgNVBAMMBmV2cm9vdDCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALVJiVydABCNEaH5n4ep49Gl21367PGI2le/ZBNojyzkciz/
 EJA4wXQCyToqRz29KGrtP9zTY89aKRR3Ab3YGNdhW/k1a9XTyDNqqowJcTaKBsPN
 RGG5PlFCThdEuy6q1GqrOM4ZaCGWH4dxShZjaT8JdhzfTWuhJerOx74nDTiPeJ9s
 33iuMUTtKMReeSk4Y6eiKkiYCjakDnLVecm5Jd/4x5M2L/1ol6fBdUxel8lnw+rd
--- a/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDHDCCAgSgAwIBAgIUY9ERAIKj0js/YbhJoMrcLnj++uowDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDEzMDEwMTAwMDAwMFoYDzIwMTQw
 MTAxMDAwMDAwWjAiMSAwHgYDVQQDDBdFeHBpcmVkIFRlc3QgRW5kLWVudGl0eTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
--- a/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC5TCCAc2gAwIBAgIUY9VlD+O8GH3DRfxtYTip4pS6eBYwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDExMDEwMTAwMDAwMFoYDzIwMTMw
 MTAxMDAwMDAwWjAkMSIwIAYDVQQDDBlFeHBpcmVkIFRlc3QgSW50ZXJtZWRpYXRl
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
--- a/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIUNQBvTayORCyTYzJVm0tzSFy1JzkwDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZRXhwaXJlZCBUZXN0IEludGVybWVkaWF0ZTAiGA8yMDE2
-MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAuMSwwKgYDVQQDDCNUZXN0IEVu
+MIIDQDCCAiigAwIBAgIUbdVCAhdH+Uzxj2NfU0cAx+OPLcQwDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZRXhwaXJlZCBUZXN0IEludGVybWVkaWF0ZTAiGA8yMDE3
+MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAuMSwwKgYDVQQDDCNUZXN0IEVu
 ZC1lbnRpdHkgd2l0aCBleHBpcmVkIGlzc3VlcjCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNcMFowJAYDVR0RBB0w
 G4IZZXhwaXJlZGlzc3Vlci5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYI
 KwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQAD
-ggEBAJDk+MajPgizYtvUGhdFpJ0yZA3afbxWG7oBzb0uT0gHHEeq2o5S3vs91wxx
-8Jzm3BJFvHIFzgV5Qvv18+mQAjtJhbToX1NbFvljR9rlzlpCCPtwe2okTeBcuL5L
-Ar8i7pBDBDG1OM/0zZF/GsnnMZ10ZdXm5YffNjrrDnKzDxpMpf5NxRu9px/c72sZ
-hAnzZpjn7Kr1Mwu75rEP4G/mY7Cm5x1htpYYIGMYUrkwmfXxvVNzX+Ut7Uid3/lO
-5zENcGhr24IIs0DgljED3DE7Q+Sp+BOMUd0h+YjB3pot5GbZxVObkz3Av3lwNhx/
-4szrDHaWNVhKTZxFpWkDAnrCOyc=
+ggEBAJ/iJ02WLS6qRwbvjGHyA32QjqSYxI6jglpLUDgeZGh1nX7N3g6NHdb4GWMv
+sULPPuoaffDM+JQT9RtqBNyYExAyksWopWOowhVCIkClXO4t9Bv3fMGX8cfgGROX
+IiuW4gOpKWL1FCEkodWR2k3ir9pscbx/qhW7imAP0ikaXmXY1izWhPbS92Wj+xUm
+ZffvInljNMZMz8x1WmFyzBOyqtsO+ipYQx04gCi/XD5w0Qq+i0Gqnl3Vm4Xczlo+
+ffNL73Sja+vPN6aKovjvuVbAXWajt6bfU4FeIHxr8KuKBTA6viIBKlhQ2svFeewR
+S8fGa1iBbDYz+jpxQtb4qH1EFVc=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC/TCCAeWgAwIBAgIUPfbYr/hfSwO52dhfVNczJUMROdEwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOVW5rbm93biBJc3N1ZXIwIhgPMjAxNjExMjcwMDAwMDBa
-GA8yMDE5MDIwNTAwMDAwMFowGjEYMBYGA1UEAwwPSUROIENlcnRpZmljYXRlMIIB
+MIIC/TCCAeWgAwIBAgIUUVNmlVZgS4XRMTChi/2DcyXZrkUwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOVW5rbm93biBJc3N1ZXIwIhgPMjAxNzExMjcwMDAwMDBa
+GA8yMDIwMDIwNTAwMDAwMFowGjEYMBYGA1UEAwwPSUROIENlcnRpZmljYXRlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
 DY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQ
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABozgwNjA0BgNVHREELTArgilidWc0MTM5MDkueG4tLWh4YWpiaGVnMmF6M2Fs
-LnhuLS1qeGFscGRscDANBgkqhkiG9w0BAQsFAAOCAQEAjWMORF3FYW6PncbV/5pb
-z3wZcJol1Nnu2kr2SHW31sDX9Ug5UHdMruov+FeZFVsUp1BfxbR82jbFZI76y3rB
-MHf8k6Ba8aVGuPikr9DOSpNnphkTy3fyyU/bbOKXeydjejhP2xoGNbSZShNlHhLk
-kNaBdLn0DI9nzAX5nd0uKEMHMHc1ZOhVT4LGZtRw2A/ZrdnSciTxIuYYb7nklBte
-qMgGIEg2YKu/u3Z7Zr7cAY3298kuSTIqiLkVhmcxCCMHzd7sbfY6j35eDRHh+IHK
-n1w05dtbfRRaJvwt1wFfkXXEFCSbIv72ltCE5Cd9ZcdV+zoQUv5hWpH1Q9i/pEx3
-iQ==
+LnhuLS1qeGFscGRscDANBgkqhkiG9w0BAQsFAAOCAQEAPql6eixXKEVio0AEc9pT
+bm6sqvYn59ILGuIUJKCJjwDXHpupHcwNsc/dVEFlrKtU469d+tHFw+Mcv30bt06i
+9eYTYzMoY0jLtcVj1tFgCzmmEb0B4Ga4e+kju6Hokw4agPju0nYvQLlRJApMVUZv
+75/jOxG+zC8G9/zTSr0kJaiAESfzVe9xDhL5zWmXG/BndRJpDzQLywH183b5NaOY
+Dlh7sSrej8GyYANjUcVrY3uEVCSg/9ZhSpt8yBjnaFgQMujaWSChUaI+UCzc+ywC
+Y0+PFvNmxWpFnNQAG/A46XUKuAuvNcNxl83QZHu7CdlBQ43hPB59j+ADxDWxzEL9
+gQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtzCCAZ+gAwIBAgIULQyOUfdRvexzutokTkMToSsuQMQwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNjExMjcwMDAw
-MDBaGA8yMDE5MDIwNTAwMDAwMFowKTEnMCUGA1UEAwweSW5hZGVxdWF0ZSBLZXkg
+MIICtzCCAZ+gAwIBAgIUfatqYV2yk/wv8kEjLoyhxgRGkuUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNzExMjcwMDAw
+MDBaGA8yMDIwMDIwNTAwMDAwMFowKTEnMCUGA1UEAwweSW5hZGVxdWF0ZSBLZXkg
 U2l6ZSBFbmQtRW50aXR5MIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgADSm7Ev
 uE/dzSmzpRnLZsQ7jY+L5UW6eThM5mPtA991mRYA65IHkNJTDOzlRNuZpx8FiWo+
 0gcWVTSqmQV+R8R+O8ga2m+h4S43JotQRqVSaPna18y0hdgaLhnVDU8LaFSsr217
 5p2aCDE24Vr6j1PByMhPxgdyed0OVdc2mlvdAgMBAAGjZTBjMC0GA1UdEQQmMCSC
 ImluYWRlcXVhdGUta2V5LXNpemUtZWUuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3
-DQEBCwUAA4IBAQCY+B8ktY9PqTioBLC09SA4n4SDF4TuhPKJFR2fhXgnakEyKVC8
-6NT6ZV5vW3Ewgn4GGBdevthiAv4IaDa2HoZ4FA4ALj2MkpRt3UtzzhKmc1Ov/dhJ
-kjpO7teDa1wWchc8mXe+dPOE+dX26hPTOaNXtVZ/+8JD9Z62GH1lTVOCjRh3tc6v
-dXQoynZueaeDd/mbgIDp1CuTDGOXgl3Dq+ib1NKuD98Sxas0PzVkl0AOarHpP4q4
-qq+dVg4UajVhyrBjd1EoQ/LfWbt/93kF46IXpPT61svTMYYIFwlxPnkCEB6SZnYD
-Ak8RNpEWURr2Fd9cWt/wkfzU1vHpaSA+kvYo
+DQEBCwUAA4IBAQBYFUVuJF4rttxx3g3JACSyruW1O/ZYzzWKyFv9Qwl7YfQfp/vx
+ew2ClEpz5gHpmqXAqqBrK6fM/aggBs/ZcimFXdSmh1x+qzRjx6aURG46Ot/RU0LX
+QrSrPVKblBDtuakvnPbu57B61tdqDox9K4HywfswHmhdxbri829bnwCRwBoDUOf7
+Qihse6GVCpGT7MhK7X0VP+UclqkRXr9AVq/gGNXqV0/gzRFjbLfzgYuwtZqTppiM
+HUyFqnmuI2XE+D5/mt7in17xY+j9kRynGVp36cpnls38fgpv+QDMRWO+eimDYufJ
+nA/u73l+L30HUQUu2VVf5GqWMKPaoEBPrCbR
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIUXXlgEZEklGJU7+b+jic3BsWeVvswDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDQTCCAimgAwIBAgIUJVVg3/CrNvV5PUJKKi+XPHtBJaUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRJbmFkZXF1YXRlIEtleSBVc2FnZSBUZXN0
 IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjbjBsMAsGA1UdDwQEAwIBAjApBgNVHREEIjAggh5p
 bmFkZXF1YXRla2V5dXNhZ2UuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIG
 CCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUA
-A4IBAQCnh8ciUcAYp6em4jSYjKmcS2mghfhj+5N2v7jT9nufNvl32Ne8RpJ3SmW4
-lWLqUD0NpGhafJpEyHADJbR4Xcdas2iXGzVmE8sKE7mPwdmF8O7bu2qvmgIvTI5z
-kiISZ2srTp9LMnTFYayW8pb5+sI+PP+Xcb2Dr05gueTrn7kLT7vIwTdfeGpnCmLB
-PhDEJDcFTgL4s7dmnnRKL1Vv0/LWTqnn2KhxQK/IITs6k4ymwVsyRx/PDBMMeg4L
-NIMCb+Ti9UoG+MCLP7qfJyq9l2iDuY8hZTKsljOdYmGSj3tlupG5opBmFup75u8O
-L4udOHfUSI/G6eAQdVDPJ4q5bj3F
+A4IBAQCSibHSmhCYLXFjM9DrnjlD0BMK0RK01YpCavfc+X+MRB/yw75Gbeam/k2m
+AA1N99xpYTdrTK9a0+2nqD2bcyRqa68MSqGObUXwaaNDePEcytDxcvh4C3mmhfCA
+lY6QeKdbTjMMEBBWQpEOKxhybV0VhpEF3DWqAOUYpvcytz4kfg0com1gdDNh3oFK
+NONWjHAsR2aTmxjDPN0w1ppL89XwcYTOMmMF8xYhAKOwMRHIb5aPC92EbbLcWgLn
+xZ/fDTLKn8ZUJ8kediZPYNYxsxI5hSpuI4okIsVmwp7Qn1NS5AHVaAGdhFEjkOmQ
+PKeF+Cc6PNL4vMfy8EP1x635rCPi
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0DCCAbigAwIBAgIUe5iYIuuiAx2O6l9U7Mn83HNj1F0wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC0DCCAbigAwIBAgIUVxC1ntHO9LbExbWIl5wFzH09KskwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAUMRIwEAYDVQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
 KZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmI
 YXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7fi
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGDAWMBQGA1Ud
-EQQNMAuCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEALHxin2gEATeFTVOR
-HM4nSfSqvg9ouFfDewQB8pTgM8tfMLKsDuOBl0GlOsBuyYDvA7nGeoECg3bH5NTM
-oBRMXYdhnHuLy2k1nlh1xLxxSTfiRGom9dP0fcwbdv/5dlHQT/zADEI+Y+sR+D09
-PPVGjvlhcA+KJtZcBddSCu3VlB3yR1RtdSeg2NbrJGP0dBf25mclGxPrC9Wez7dN
-BuMNsyn2qgWUc9UjG2eiG0WrtDlTftq/0/9T4UO2Cmc5rLUMhkWH40aXS4UEFHkP
-GX/gUsSwBGpJiAzBSq+8fQXOGnA/oOxU/hYpPT2vIOB4cdZ5CiIV3n8gwpmnEtwS
-OuHqvw==
+EQQNMAuCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAV+8D9UEd/6GOwMNI
+ahgtcu06Mu9dmOXJ4rpMs3rs+xAKVbr3/lrApgATKqTSc3+T0A7ERGzhPwrQnUuv
+DF7JLwCMkA9rUHLPOSJOqUfGV1NWf7G+gtoOhXXdDeLaF1CCoOjp2Fvd2hx1pZNE
+ZT+EMaG5+dGA2EXgBFThVg0SPVxMY6egc2Q+eBw4TGYkvOrg7uPGNYrDWLmw4P9Z
+QxgvJ3ThYnM39jxjE6/reUuXI7Nvf9jFm1WTHtWWQ4Dsy+ObfgB3+or3rrWM1t4W
+qjosDYdHD9iGO04ODPjFLJaRBgbWhxSblmPFCHAWUyjJF4WDFepOVNXetjGYqLDP
+n7YMHg==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDNjCCAh6gAwIBAgIUGUp8qIucVUZ0D+cPoEILDVfteu8wDQYJKoZIhvcNAQEE
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDExMDEwMTAwMDAwMFoYDzIwMTMw
 MTAxMDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IE1ENVNpZ25hdHVyZS1FeHBpcmVk
 IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDLDCCAhSgAwIBAgIUH7ZO8Gi7DYRepVBSXsLTG2/NF0IwDQYJKoZIhvcNAQEE
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDLDCCAhSgAwIBAgIUGVK3Zf+il1rNT9G5JDVvaU1Hw48wDQYJKoZIhvcNAQEE
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEVuZC1lbnRpdHkgd2l0aCBNRDUg
 c2lnbmF0dXJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
 sdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbY
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABo1swWTAjBgNVHREEHDAaghhtZDVzaWduYXR1cmUuZXhh
 bXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9j
-YWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBBAUAA4IBAQA6/am81X3o6D5A3Cx7zpCt
-yWTmkBDiPyJAT2GYS0z5zqv1eAclNrlOmY1/S/CYHuDqtk4AHSvi4mlRpAOShNGD
-guQmXtUtl7OHukB/H29YuB+aCy1RXa4or9mGCSDCZAMPhADU7zSmWj9mgmFXUdcl
-j/ArhIAl5vFLNlJOUI5XZKearF3EkfKBchV15q2yvtFhppMhCYc9ABPvNxzozOgS
-6nXhWH2wO0vJQg5o9N4ymQilFLoqgsQ7U8d6ktbwAa5SGtVyz6+H7fZuqXx8l6gG
-A2EA65gilJmcMcoM7l7PWugmblm2jdmaTZyl0JIADeYc5bBmrJpo43mEZ/YTyn0B
+YWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBBAUAA4IBAQBeAIdVocMZfEVXFSiwACmQ
+eHOOoGwkj12gvmjnNIXw4+fbLUytmdZ8U56XD8HmFn6e4d2PypgHG+YyMOCYY9WU
+me+ktf6baPObXrljUVt2TZ3BNAUfQcSul88ZJVBaHmD4dD0+tDoLiw9AFzXkCGFp
+lZ8kF85PfzWQMpMHwch/MHqEUIrO4Woqaus5vlB0TuE+G2QaKoiv9bacMW9G5Aoh
+2kAeCPj1Ketb41ervQzQB0kYbcbkztTJABM5HPsFYCkzSd3+9wVsQru6U+N5ss70
+gp28+t4Ed8YBe66e/FEtsI8QmUoTI51anOrbs717Ono5mZJbW14EzgVFRzEpCCeM
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUXWNmi3NOMsq8iBKvohtG0kX2YFIwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDEzMDEwMTAwMDAwMFoYDzIwMTQw
 MTAxMDAwMDAwWjArMSkwJwYDVQQDDCBNaXNtYXRjaC1FeHBpcmVkIFRlc3QgRW5k
 LWVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
 AjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDLzCCAhegAwIBAgIUcYUtGOYg2nrx/OAYr+cxTZVbv34wDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDMzMDEwMTAwMDAwMFoYDzIwMzQw
 MTAxMDAwMDAwWjAxMS8wLQYDVQQDDCZNaXNtYXRjaC1Ob3QgWWV0IFZhbGlkIFRl
 c3QgRW5kLWVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
 UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
 r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
 fq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDOTCCAiGgAwIBAgIUO1bWrdrsbGfiDSe6i14vOA3vWsIwDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDExMDEwMTAwMDAwMFoY
 DzIwMTMwMTAxMDAwMDAwWjA1MTMwMQYDVQQDDCpNaXNtYXRjaC1VbnRydXN0ZWQt
 RXhwaXJlZCBUZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
 TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDMTCCAhmgAwIBAgIUI15H3MmKWvtSnradQVGiRprLPYUwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJNaXNtYXRjaC1VbnRydXN0ZWQg
+MIIDMTCCAhmgAwIBAgIUDdGO5cpFcrItBlAAbm0Ez31JKIQwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJNaXNtYXRjaC1VbnRydXN0ZWQg
 VGVzdCBFbmQtZW50aXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
 D/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfT
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABo1owWDAiBgNVHREEGzAZghdkb2VzbnRtYXRj
 aC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6
-Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAAGpBXp8dsNSZLoj
-EV09a/rfaWdXwHyKWyRpCbfABndcwRZG79a21O04P5QDmuM2WokyB6tt90H3kx0J
-YZUs2iP0/mB+CNipqFUcIxNZUANRvel5MT/jW9f3nLthdc2gRulKs/8hmHUx8EF6
-OH2bC1ZFhbaAQYDYH8mnvszz29cK+hZLFIEp4LwS/Crdx1AMjDRI4wdsRRmmsBTn
-tb+z/48w0TTadFPJj1ToTAa/jsLqed6M90mItyMVSEdvCcf5y3J2MUO1S2itN1n5
-AXomtsJS+ljObx6Tp5XmFz3GfPg+VBTco+Siwr1imuiP3NLGv5xgGSIM6Z2CQu3b
-54qry4c=
+Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAAGreOmEEYmz9Axp
+sp9x1d8COaVi7FjzpMT03W8edkTTGHHah7NGLeEBRuMZ9OO5gDIL60KmKMpEk3HH
+IpUggSid1Zq4s+pFHVy67sE1nVkNhnh6/yXsfBQ6/gl/pKr0c371RpGjEygq/o5m
+ccl5SfLMDIGaFek5F7UBFYH2OjSVMovqeLtO0ehK2b/g8Cz0jaSZWI/aYZ3gODy2
+TTSnp0mkOMgtURCLXXa/8wKoqGPvFx3px3X3eTKEpzo6Fu1y59EV2RWLTZwEilwm
+ctTDFNLYBvLSP7MPLsiFPXRoIqRnQvwuiTdwzoF4X85X11MSQb/KfrnehIIdYLX+
+zbhbqCo=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIUCWSylnsMmiaoYSxwQpKoJpOKCxwwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDQDCCAiigAwIBAgIUMXyOSPBp+OIoBH2Y1P+y80/h844wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhNaXNtYXRjaCBUZXN0IEVuZC1lbnRpdHkw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
 9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw
 4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
 AgMBAAGjeTB3MEEGA1UdEQQ6MDiCF2RvZXNudG1hdGNoLmV4YW1wbGUuY29tgh0q
 LmFsc29kb2VzbnRtYXRjaC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYI
 KwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQAD
-ggEBABq3oqN06wh3jVmPBj++42hnzyL+e0EybeJB2p3bjkhOk9Uc2mYw5u4B9487
-EcaKDkWGX+fqQiZAkzPCFNIZcf+2214V0+XxqZ8UJpdRdX4KradUu6YuvUpGN2xr
-LJ2rL3Ce4A2VkhbPounEFt3SUedU3hcsej1TiuBXvKWcIox1KY7eMKAP7aa7qsvC
-uDJ2SBHAtqYA0aGexV6LoXiJYxNcHfOZa1I4tbAQZhW6aYBOuTvWx9k0hK3UXG3P
-FYZobjn6445Qa5RigUgntCKSFdoRFmdl7s05gCRI87IZMXAyaJVz4SrjdQk4BTRR
-K7uEBP1UoVUqYZD8cqcJ4Gjd+SQ=
+ggEBAEtF88Fbmg5qISbqd295Y12curtJLUGVdvuhcE2BXfCDudSH7lZwpkilli5i
+3LUf8sIMfQ5ZOw7E9JLp3l3Cg/0V3jMedTdnTMCqTDZ/hyoA4cfqWDfwA7+RmSEd
+feoZGsqOXijjiOsd5QxOwBMH6l7VfpJztZEAMLyYvqNOoIMW3m6Kr4YHgNaNRb6U
+/ld+S9ZeZaVz8ROajvetMW6fnJs8YJ5/qOEc0buNoqYfkua9TqMU4boiySvlbbuA
+yo/bctC8han/6f/OExMtLpZkDMu+FnaJelUETOXA04aK1yRqrEG7pZEs9nZ4jpny
+m094ft9bsAym7CtCuIesDo9C0m8=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAgIUazpUE4BukwguEQzZN1gkxl5r0wEwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIICxDCCAaygAwIBAgIUZzTrrMItg1s0IvbUa1KDj8fC34IwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdkb2VzbnRtYXRjaC5leGFtcGxlLmNvbTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEASp723F1LCLGaFN4dT48iUm+38hyKo1JV
-pjs6x3u7AmcILsr7qYuZHamC7/12imf6YhQAg4qioXPQO5GssPxPY/h/+W+LTrDl
-InMWPB0yAJTLLU2rZHFlqdUMQjChCdxH54X/ZGvu+FJL7XZVdtBENOCR+xUuUXEA
-tee9boH0JtCueKPn67Bv1viNvm8tCcg11mQM8Tm7pVEEq4XDj8RPqPuZlE6nsBg2
-uBh7h0jDkzeUsy3MyAcbk7FtffsmwFrjgjV7oTFedeq1kYqruewHcJpZOX/Ts92L
-vcMiyd6V7DdV1YS8XYqp0vxAE5S66Xhjla7eoYesKhe6AlMG0OkFWg==
+AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZK7O9XByF9cbalKaxX2dz8pHN3+M/H5K
+eLRixH1dlngfzKwZfAJUSbgbldTbb+607t5QYqUtWkX52mwcpGhXxqPLP+DATy6e
+ud6QgJ692V0GVvq4qzY+dr1j/At9rFhuA/pejhWJdC/jt+rBelyXF5k1JDDXX9uo
+hfwxZDJ69xuzWVRBBd1CEcR+33XkUqqBYrYwPi15+oFaTGICP2jp7oqBFmdXb8v6
+j+5Fi6vJN8skPWQ+CZBmYPoq8lkNMUD7AJBhLiWhQYqA0qilPfZrxeJ1oqe/Qq9F
+kfyHJn+IRJ/ViS6UonsvYADl2W+OwLvZefJkySnaNSlqGF69MMqSWQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/mitm.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/mitm.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC+jCCAeKgAwIBAgIUEeg5ETFB4yT6lPxRZ18k9rDVmqowDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOVGVzdCBNSVRNIFJvb3QwIhgPMjAxNjExMjcwMDAwMDBa
-GA8yMDE5MDIwNTAwMDAwMFowMDEuMCwGA1UEAwwlVGVzdCBlbmQtZW50aXR5IGlz
+MIIC+jCCAeKgAwIBAgIUTdh0gfhpjK9ujqRqcln2CcdL+cUwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOVGVzdCBNSVRNIFJvb3QwIhgPMjAxNzExMjcwMDAwMDBa
+GA8yMDIwMDIwNTAwMDAwMFowMDEuMCwGA1UEAwwlVGVzdCBlbmQtZW50aXR5IGlz
 c3VlZCBmcm9tIE1JVE0gUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
 bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
 Du0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhI
 H6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8
 rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
 Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMfMB0wGwYDVR0RBBQwEoIQbWl0bS5l
-eGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHDyyXCBKd2xYyHOw25cei6gU
-MAXeyHZyC6+8h62U61eGL7KWnO+xjVuSK1KlvQjo1G1R0ypkmZzBcNjO/GEfqr06
-xkkGKlTUJcDNyzCFpOm4GDvp3Ojm6SOZT2YeilMjpRU8ONLhFn5s3YvhF2WWp9Al
-1qooxIE6XGJ7TSrA76iEgr1k6+XGg2UULpAONIJZ5K8eS21VWC1r0QKbPWmQ1O1y
-ltEtiC0DluBLeEQf6x5POCNbNaERf1tTVmiNZe2waavvR/gCz+XpxY5k6dnLq8Gf
-cJ4Id3UlcZ5A5W7urNIlMeI2wWhevboRTIx2tKNOQ+3tgsYdf3vGJ2OEqjg5cA==
+eGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAgs6PjXbhCPNwqn8skjx+DxfU
+Df2JLpS9H4PJU1wFQOzuSA3+10UmVuORpXroEe0w+3/DWBhPZmu+dUyYknQ7TJFz
+oWmPe5GxHcqFD/v4Mn2zhAJ2pHPUQAv2YzmgxNIYo7X6LsWOK6dwalyAnKGR7soB
+XO9LQl4hLZoOAv/C5XnW5a7P3ePk8WkA9hRMEdUc3AmFx2yBtSeEemsly4Pg438q
+Xi5CsbEdhYQysk81b2KEpC1/xSW29gfATeLuwU+wAJPNxngvibHmGAwRA4SRTq40
+51JkCamInozToPrvLFn6oFT+aetTxUSup1pEMQp8cL1kOOOJx0oOm04+y04ttA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIUU0vdjWJEnB3aPkcVi4KBeHNvvh8wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDAzCCAeugAwIBAgIUewgUWXAILzvNfOP1sd8Qfwz5E7kwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjApMScwJQYDVQQDDB5FbmQtZW50aXR5IHdpdGggbm8gdmFsaWQg
 bmFtZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
 iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjNjA0MDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0
-cDovL2xvY2FsaG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEARfME7Qjfsdeg
-ZFxH68aUyHM8rRAdtw0MFtgmr6tRNPoIqIOVQPjWwLqG4pLA9CxHF7nUMLdKM0UL
-utNYMhq3uy4uZnCMyq2w48PlZ+S1iiPGq16HDZqm3xV0KjSEEolozxV01pFZFvm0
-78Fftr7Tmn3Ix6sJ+IRB1QWiaxvP31xrdVH9MeUsyd0i4j3RCGAK+/BnZNVYe95d
-p+1AVFmEOQaPIQbO7goOPxVDzdszHyc/ornphiL9gJS0g85VIiumaac/N55r/yVb
-TOXZEk/Kon+evqVdYDfCx2F+OBo+qkBsND0+4AwaZfFir2g07a3btG5SxQZFFWIR
-Nb7u1VsuKw==
+cDovL2xvY2FsaG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAbQrs+vIktx/H
+XmVUAcobUz1Wl/LXO4F2tE9hYNHXA4U3vWyKSJVxypDuLxYEtDoTScTIuihEyn00
+qrLxW7nTw4f6Pwo6WKlkfkTWoj9osw0+rhdHllYKhNc4HqaNtFxMRvyitenEAWxn
+Zt6uOktu3CUPxZlqAWq5v1EqcccfCc+wcQhyGnDJ6fi/bVnTWcAKgDEWfg3AGsea
+EktpVKLrVstkoEZjzJ6h0vc7Mc1b1wPQjP5NZVD4hZxMX6LzF1MO3Iw/OaoXqwpj
+NGSoGzv282FIAGvu91pXQYfPYeIU/USx/aido1Y2+D6RDnU4AoxO9ysv+pAXCXRa
+LF/YeL8AIA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDJjCCAg6gAwIBAgIUH+AmYB0Pf6g+gBjtVqu94DStb3UwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDMxMDEwMTAwMDAwMFoYDzIwMzIw
 MTAxMDAwMDAwWjAoMSYwJAYDVQQDDB1Ob3QgWWV0IFZhbGlkIFRlc3QgRW5kLWVu
 dGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1u
 togGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6
 pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqL
 KkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3Zlqq
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC6zCCAdOgAwIBAgIUW7kXNYkW5OLObAOtdMQ9uL8FHUkwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDMxMDEwMTAwMDAwMFoYDzIwMzMw
 MTAxMDAwMDAwWjAqMSgwJgYDVQQDDB9Ob3QgWWV0IFZhbGlkIFRlc3QgSW50ZXJt
 ZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB
 /W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRx
 CHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMC
 OosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdm
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDUDCCAjigAwIBAgIUW27MuNGTdB0Jr9hV8Q3vjsROLaIwDQYJKoZIhvcNAQEL
+MIIDUDCCAjigAwIBAgIUNdA80OHIj+WMQbwgIb3321WrhY4wDQYJKoZIhvcNAQEL
 BQAwKjEoMCYGA1UEAwwfTm90IFlldCBWYWxpZCBUZXN0IEludGVybWVkaWF0ZTAi
-GA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjA0MTIwMAYDVQQDDClU
+GA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjA0MTIwMAYDVQQDDClU
 ZXN0IEVuZC1lbnRpdHkgd2l0aCBub3QgeWV0IHZhbGlkIGlzc3VlcjCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1
 SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+
 zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYL
 K7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwc
 bJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibW
 JZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNg
 MF4wKAYDVR0RBCEwH4Idbm90eWV0dmFsaWRpc3N1ZXIuZXhhbXBsZS5jb20wMgYI
 KwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgv
-MA0GCSqGSIb3DQEBCwUAA4IBAQBKtjHcOAA73D56UqgRPDbwrVPp7VOLII8sV3x3
-pfe4AokQZZHHUuadscSFm8nxFp4jBiDeaZehl7QHRk1baJSpuHlvXEhtanH3WnxF
-IplhC4Pa6jZv4DMDjgI++IaR60tupdeSd17Ye43ZfQ7AuEDUYEQTkXYm1Mo56uhT
-30zWVBzW6tED9kBmTgHENEgrTDxQE7CDm+gOwQjcXO7miHIq8bjwYNG3epZIQ+If
-nHEt2JfrUYyvRHaWaNNrPK3+Mr7lsHwNYCRfA/3GHwS1/LGOOsTfJYh4wfuvyBPG
-14t853gaj13Tc3v8ve9/ZorZc193DBuo6y/sTGNvycAXBmsy
+MA0GCSqGSIb3DQEBCwUAA4IBAQCdI5Gmlrs7pyuP5f2LdInMxYUTuhspa2RDOm8L
+P6g8X6jTRPCqcKCwvzQpdNbiUVmPWk6MgAIPueggVpDYRbFELjNjYT2VcSky3v8E
+U2QgGzLdV5wjb1nwFKd+zBqF3N3YIq027vZUht00MJaUKUqU9g7sCihpuP1vXqSX
+k72DXaybxMf+n1ay5DRAlnzM4p7T+orgwzB0JcguB9OgF5WSyw7sfG+7toE11KxW
+1Rn8TsHtjfOUASpH+7Qj0GCMlKa0gm183xrCqofCBvyQ1DTgS8JyiGNT0aehbTCA
+WnlLL3gpTrMTj4CWxWkidYLeIhr0p2Yz081Kg3s9DfmFawq+
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAeegAwIBAgIUB8G7+TWgmR76sMIVpSRhAH3L1HswDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC/zCCAeegAwIBAgIUSyPlP7BCMl6PmMfEZlnpbm01NjMwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNuc0NlcnRUeXBlIENyaXRpY2FsMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
 ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYk
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 oz0wOzAjBgNVHREEHDAagglsb2NhbGhvc3SCDSouZXhhbXBsZS5jb20wFAYJYIZI
-AYb4QgEBAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQAdAsN8tntTDhYs/uyu
-Sjzux9W0+S1AG7PcYptkfupe+CejPg3I7gVAT7TQplltI6z+HffVkL4hPwjS4GWS
-HIlgq54ZssUtXWPZvfPgarQnVTj36ScG9Q48Z8BYRqnx1kCaXYVXDPlz0Krdmm6F
-Jx+sJuVZMwKXz3tbSxCvcqMOHh4M31BK7GMGe6UBI2QZJnLrFLPYxFbAvU50Qoom
-ziIRbRqP+eEIJm5q7AJTQZJSPFAA7yMbwrYY6HoJqLQ+sq45m2kk7f+xj3FrRQ1g
-JeUlYkoqx7KSzTtWaj7Yrri3+IrAMp/g9BJuEmpV2wTJvuVOuu+cMAMAbjlB+A0n
-jOKH
+AYb4QgEBAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQBplYwcCzaVXXjPpF5/
+N57VSwoMfDEMJVRREPPKhVF7ZgoKHfzdmHsViGp4CuUiigke/KfrexqxGzMPw8fR
+xiUvmeHJjvrriSD+exdFOEXxMHF1YYPc8ecnnpqcFcl7xzdLJxdpNfSiXqYf8gcA
+lgpxzs1CUNDF8vECk5QjVHTvJ/XLjFz3C/Z8Z3cH3jET21p3DleZBxtQj7InIu2n
+cZGSeOBBio0ZgLe8kE1CQxPA1z+sBrz9Tf5tgxeMDwxhkFpn6GrkcKNa33DWUaVc
+LXU8Yt6Fk5RsPkSYlwz0HpXvKyl2NHWkGxiJrDVQPO49Ri5pR5UZImhsmnCAyKBu
+mOmY
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgIUaRFXPPL2Y3AEf8wBU+X5WrkeKK0wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDMDCCAhigAwIBAgIUATkoazbZSMf7ZLZ6jakmjnrfKPUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRuc0NlcnRUeXBlIENyaXRpY2FsIFdpdGgg
 ZXh0S2V5VXNhZ2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjXTBbMCMGA1UdEQQcMBqCCWxvY2FsaG9zdIINKi5l
 eGFtcGxlLmNvbTAUBglghkgBhvhCAQEBAf8EBAMCBkAwCQYDVR0TBAIwADATBgNV
-HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAM6bZfB1Ag2XY5hQY
-k7D/gVWIjahsV8yxIWT6KgUxmAsHiRVh+BWV79nspVrPuOJ+2IdD+i037ST9hQ9F
-KHNoui248A+afi+KtO/VALkxtbILVb0gJLdmtnM12Pl92Yr5T6dUNF25QxqYN/bD
-NliDyi5CxFtwjnSGdiFYRj7zSOtIjJiKDvE/aXkCSEeY/7GueYM9mJ5jA4w+jJPU
-9yWW3ByOixF5cF4NRkwqtzUDz6JCYVjD0jSvyOwNGBIs+EETZI/NKpFr+jndsglU
-xNyPCNC9vC0SED0vRR5LQHRh/IwDSr9X40ZF290bnVm50Bkgh0sGnVltwTadeZsy
-a2EBQQ==
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAZ7ow4w4h3t2Rzwky
+nQe2GZBH/sANaSyfajTrPi1s+veBV3RDi1Cmj5jRmjqOW9EcjVD6ioIUFm7w1k4c
+FLhGBtkUX1gdELI6ZFr2QhRtcX+9af0kJZG8rrCND9eLHAFvbniHI8zH4aAe3c+C
+2nw9znQYA1VeipzxBkWW7FWylGulfd978gWlLtc6hl2Mia1GUTkL7HTtEyuFILzc
+P+/JRQs42MSZdeYlZLlwlsWMOUToL/HsW4My4y3bOBZs61l63kKXRwviPb32qg/g
+/csgu/wRyYhpd8uSgsTGxQ4KSZkfs+ccKY5V0OHhvIj2GlpsfT5BCUJvFO71q85Y
+24BVCA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDADCCAeigAwIBAgIUax++2Gpd5Oh04FfNUujbIcTeQaswDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDADCCAeigAwIBAgIUU4Y3SqobuZKI8GivtsSkRvpFqfgwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAiMSAwHgYDVQQDDBduc0NlcnRUeXBlIE5vdCBDcml0aWNhbDCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
 AwEAAaM6MDgwIwYDVR0RBBwwGoIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tMBEG
-CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAVpb3K7f9OP42BO8G
-JOUVeEwILiuYzHqOfOIdU9FxH0TU/3NyMhAmDCWlBbCRPAtF1kMyqpcL51KRz1sD
-vJ0YqiQpuEqfos21PI9LuCW1OyuUxbQ8B7z4BQF2ocks6igQKY1ooCsPBNcaUEaZ
-IPM5QZOUETcBWs/470EAkCvdxWpGVIn6l1wV+ezozZ90Nzg9rSPZDEcFKUf+lihw
-+nMwm1grxJS12YjVfLXUvGXd+IT/Cc9hy1CKFI7sBLK9aQvH8UJei0rFFpgv3pi2
-q7BF0tYY4fkeZfPnuNOTyF3I5xLVY8t4giZ4IByVM68m1jpvBkt8x1uWcopzjmtG
-dc97rw==
+CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAXwFEbSMv685PXPxn
+8uxd/DeSU8457I0Frrxt35I7lW+N7oBrb4SdbIYT2J7WXZFwrZBDFkOadz6Mkepd
+J+59jNg0LLchW32v9yVQInNK0JzaLiURlNHGo7JMd1DSe5r8lo9oPf9JK2N0RgXc
+C5kjFa/C70AyXr0YDSj6IDqVpMPP1/Iu2TYzaD/iErm0fjoxS+Ql2PwpxnfeCA7l
+6CpctagRe1Qa5rVl+DuZs1pF8dWmRs7nI2GgDcx8j10+gVRgz61TzIrf261HQ4vI
+Qj/x8JevxqiU04l44HeT+W/uaqgxv8troAmMAaGpFPjeNSDxTX/r7mBaDboF/Ul4
+lt1akg==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
@@ -1,21 +1,22 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDfzCCAmegAwIBAgIUE1y6lH4829tHgGg4QrW+UpW5w2YwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAnMSUwIwYDVQQDDBxXcm9uZyBDQSBQaW4gVGVzdCBF
+MIIDfzCCAmegAwIBAgIUCT55PUQqStHl0hiOSunYT14acDkwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAnMSUwIwYDVQQDDBxXcm9uZyBDQSBQaW4gVGVzdCBF
 bmQtRW50aXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXXGUmYJ
 n3cIKmeR8bh2w39c5TiwbErNIrHL1G+mWtoq3UHIwkmKxKOzwfYUh/QbaYlBvYCl
 HDwSAkTFhKTESDMF5ROMAQbPCL6ahidguuai6PNvI8XZgxO53683g0XazlHU1tzS
 pss8xwbrzTBw7JjM5AqlkdcpWn9xxb5maR0rLf7ISURZC8Wj6kn9k7HXU0BfF3N2
 mZWGZiVHl+1CaQiICBFCIGmYikP+5Izmh4HdIramnNKDdRMfkysSjOKG+n0lHAYq
 0n7wFvGHzdVOgys1uJMPdLqQqovHYWckKrH9bWIUDRjEwLjGj8N0hFcyStfehuZV
 Lx0eGR1xIWjTuwIDAQABo4GtMIGqMHQGA1UdEQRtMGuCKCouaW5jbHVkZS1zdWJk
 b21haW5zLnBpbm5pbmcuZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5z
 LnBpbm5pbmcuZXhhbXBsZS5jb22CFSoucGlubmluZy5leGFtcGxlLmNvbTAyBggr
 BgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8w
-DQYJKoZIhvcNAQELBQADggEBAHzsLQfL4xsuYpgU2UcPIrbWa6SALYEtH50XX9CA
-pvlndj9K33aMjlCYp/Pc0elkmBOI9epEt7h51FC8B58owBz8rPnuELxdxIfOhQjp
-M4BplETuCdquBhVUJ1+rCH5B1IO/UQoZ5PSgZfE0AWm9QhNhzCnjtt3IXNEJ7TU+
-9bh+Lc/JWB+sxWHp3aQYOZbUbyjqFh5ACyn6j8lvV+F98nz4ECftTc6FtzzaPJ0L
-MxSejhe4vtpIKyaTlYeMfs+EwAGiBBcqurQ4G3psegMnmpzg276L4kJS7PLWdyt3
-zhAWnBhjeeWzzYDNldUHeBLHaPrkRcqIAtiU25RmEwiAYrw=
+DQYJKoZIhvcNAQELBQADggEBAB8BslbC8cckQrxvj5x1Vio4h/r3s7KIo4i0Q0GQ
+t9GW9+w3mj5AGKujYfDidCpnEgaLptp4QBem1ieC8XbZxx9zDeMkdZSKJccDGNx6
+Ac8Smf1EdV/RtpZ4Ac0hfKS2/yzxg3ef0OeSPJcGghqEpHcVF0NAgCUExqFzxasi
+FJajmpXgyX5AVwDR66y7bLxhBL7Wc4NxDaSYg1NXj7tsZ/zrs+1w6zp75pwnPDQ5
+pKzcUfSIIiyApPZOHzH8jKxKeDiOxC+cEvzIffZAeS60zbUh5zr/1lvGAJ4iau52
+KyGtcVxYSNE9zo1dPj76tATV9ftuWMIKZDjjXqtu29WLiuo=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAcegAwIBAgIURym6o+VN9xgZXT/QLrvN/nv1ZN4wDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE1MDEwMTAwMDAwMFoY
 DzIwMjUwMTAxMDAwMDAwWjAYMRYwFAYDVQQDDA1PdGhlciB0ZXN0IENBMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXXGUmYJn3cIKmeR8bh2w39c5Tiw
 bErNIrHL1G+mWtoq3UHIwkmKxKOzwfYUh/QbaYlBvYClHDwSAkTFhKTESDMF5ROM
 AQbPCL6ahidguuai6PNvI8XZgxO53683g0XazlHU1tzSpss8xwbrzTBw7JjM5Aql
 kdcpWn9xxb5maR0rLf7ISURZC8Wj6kn9k7HXU0BfF3N2mZWGZiVHl+1CaQiICBFC
--- a/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
@@ -1,21 +1,22 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDeTCCAmGgAwIBAgIUKWFj/2lfZcosxc6YJxWtB5Al8gEwDQYJKoZIhvcNAQEL
+MIIDeTCCAmGgAwIBAgIUPU/l3ZRO4NIFyiIcoazs8kseC+gwDQYJKoZIhvcNAQEL
 BQAwMzExMC8GA1UEAwwoVGVzdCBTZWxmLXNpZ25lZCBFbmQtZW50aXR5IHdpdGgg
-Q0EgdHJ1ZTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAzMTEw
+Q0EgdHJ1ZTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAzMTEw
 LwYDVQQDDChUZXN0IFNlbGYtc2lnbmVkIEVuZC1lbnRpdHkgd2l0aCBDQSB0cnVl
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
 jQIDAQABo4GAMH4wDAYDVR0TBAUwAwEB/zAyBggrBgEFBQcBAQQmMCQwIgYIKwYB
 BQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wOgYDVR0RBDMwMYIvc2VsZi1z
 aWduZWQtZW5kLWVudGl0eS13aXRoLWNBLXRydWUuZXhhbXBsZS5jb20wDQYJKoZI
-hvcNAQELBQADggEBAGjsb7WuvflRi49LHCW/ceKazVB/hanEqCLOg2Q2WCxWo2Bf
-WP44NXH5mzuqDVRbkkCrwnfQfUL50yNm7I1/i/lQwRSUDkKwHTiOj+JoqDnBFNu3
-7pzusvFCQoR4xdZmuxs4cQPweBrXI/inCTi7zP4GmrwI5IzqcULGemg0mtcQXMFf
-ir8Djpggurv7Ti/J39Zv6gvQ8F6QTtQeBdVGTbknPuA0eG3YelcoljLTxNS4X2U8
-RH5snIgf3nqSHfgTYnoozxL+Rkrn449uvgit6EbBikbIUOqGlxf3el+ufQhc0hJd
-AgbWC3jJ9cEdeUycuRna8e2J3hwxgUpp9j5ZLwc=
+hvcNAQELBQADggEBAI4h0A2HRKvfRsxuDt65LZaUkfOCzZo5EmebuXD8289cC1Ie
+mremMESH1jKUUzkzt8bn2RD8kuqYBKR7gRJDYR2STXNyeSXdkNToff97cmHqss0J
+mkNiI2/jUo9IuBNo4gPY9ekZZCr/jpCv9P1GiixRlvHAALuhUsdtNp9ZR93rH2oS
+HAY80dQvqX8aA1/FQfRE6T/kVfaX23tGpfmBSMOvYFZKiwv7BPzHI+Kli+56gxHW
+oydO9ln4zm6iC2gfgq4+1n4FZbgclYzdJvIKXPCBe6xDk8ZBWEIRamLUIi/UvzF5
+kSyoqArDSfN9b/BcRV2CqIvum6vQEogoBx8hZyg=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
@@ -1,21 +1,22 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDhzCCAm+gAwIBAgIUGVTYRwMkbGXQwp/7YCXnRdIhtAgwDQYJKoZIhvcNAQEL
+MIIDhzCCAm+gAwIBAgIUXfOHPZOKSbnxF7EWV4kchUIRDXAwDQYJKoZIhvcNAQEL
 BQAwNTEzMDEGA1UEAwwqU2VsZi1zaWduZWQgSW5hZGVxdWF0ZSBFS1UgVGVzdCBF
-bmQtZW50aXR5MCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMDUx
+bmQtZW50aXR5MCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMDUx
 MzAxBgNVBAMMKlNlbGYtc2lnbmVkIEluYWRlcXVhdGUgRUtVIFRlc3QgRW5kLWVu
 dGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1u
 togGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6
 pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqL
 KkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3Zlqq
 fgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3sv
 Im9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6za
 GAo17Y0CAwEAAaOBijCBhzALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUH
 AwEwLwYDVR0RBCgwJoIkc2VsZnNpZ25lZC1pbmFkZXF1YXRlRUtVLmV4YW1wbGUu
 Y29tMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2FsaG9z
-dDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAEUdtum+T/YtfyAmlIZM/VTk3K0F3
-cPBquqLcZ0QiiXn/Rpijw8iTRuXrLwDOtKmobceVqHVVn25FSgbdtlIMlMYF7CkG
-kUINzJwA2gwmlEOEIvummLhyu3PPZeoCOf//BHbusHFH5zRKnUYCqCRBEkTxQV43
-hqtYDh1sd8nCa4utMeTcSqL8eUX5IYCt4UPg4w53p9z8QJ3iFuYWRGrUZC1VPt1Z
-RMq8o/UltNCUSkn1H9pYPPnNFQhadCsT+1dStgVC9QZC+V5/qJkjRH4hzdNSOfHw
-GMSkyq+XHud3qTZKmkCvWGBKx8Jnfw2ZPGMVzSzjDf5Z/B2FkL7l6osmPw==
+dDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAtOHODHOo0GAoO8zp/A3xC/MFkqqt
+KQVgHnUtyenf7B5rB3wchYFxlfK7Vu3OENZLG9V5/YZzJh1+yXiM7XEnXSG+3ML9
+8cy6/+7WkvBJAxdfzyFq6fcOi7r30abS5k79RUTFJWDNQ6VKeW0J6nMFwWoPe/2G
+AA+BB3R5ij3HJjbGZZte5537yNEMUROOqHo2cWdA3fGRj4THDz+MTYeTpaHGIrgr
+ZIPRhxbtNsBlO24x150YV7hQ8CsfhptPbMTioYpX05H3TmzJFrZda1zyQeCVK/Qt
+TgGW6YcxwV0FAzNGeCLJttlJbflFzTSJZVwpZnfgZvyOoK9JIvL3OlkQuA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDNzCCAh+gAwIBAgIUbd4XB6Yn67D1Gr00ZwkPKwM4HiEwDQYJKoZIhvcNAQEL
+MIIDNzCCAh+gAwIBAgIUETukl3QkKqcfquU4eovqzX/tmXYwDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbU2VsZi1zaWduZWQgVGVzdCBFbmQtZW50aXR5MCIYDzIw
-MTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMCYxJDAiBgNVBAMMG1NlbGYt
+MTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMCYxJDAiBgNVBAMMG1NlbGYt
 c2lnbmVkIFRlc3QgRW5kLWVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72x
 nAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lM
 wmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF
 4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNZMFcwIQYDVR0RBBowGIIWc2Vs
 ZnNpZ25lZC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGG
-Fmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAD85S5Bb
-DvuyQ4U+IfVTfrZAwFU7FqjiCHUQUPEVMBCkk5D5TNSEjOoGElHQuVKyVlvbn96d
-QW2ZkCwJzsRr2fqzHIgU7Wod14Z7gCRLHBUK4NrChfKegi8KI0XeESA23Go3w/Dp
-hO1Wx5AgxggAsjTIGQWIa8KhDEw+7EJk2wlRiPMtamtqTHjXIYrbRTmZSgoG8Il8
-SC8bFG8rMQrW0zmt8D0jN6L3w4W4bJBP7DeM41qNunzCeysyinsWy7XqCaelloWA
-aIddq3m/T7lcJeUsF42tkdl/jB6+CHcBvVziTkhzcZTM9Ww5RYBR3tqiDcTW9/Az
-XnpMIluyKp0bZK0=
+Fmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAHtBrD46
+n8hsbu3FldQRkEYZu31mtD3cgK8fmCbRwYnvFAJ9vV9UfuVgFcgAIS6KdLYPRHdF
+Jndt407E6iVfoNBQUaEiJZbwozFsZPME+CGKiKC9NJbgzzUA+3XvpPx5somner9B
+m2/jqEd49eWLySwkZ2P9yrs/c5aJcstpRsLcIYdH3sOxd2BBYfiBJA8BYinmypJx
+h4OUVQyR4ghNpah1wSlu8GliN7j9Ha0WjsU5zs6L1e0geOvIhnKL1RnpgLzNpfWp
+llxlv9fUKBVTCyM9r4t31zTyyPho4+QpQHRv1kfBwHbltUY2QABkfIK5mzzLOvWL
+1v1/Cgce3WAT03Y=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUXQU77wu7MDt3G1ViBp/+eg60PnIwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC0zCCAbugAwIBAgIUKaFwIwCwHXUgKRuOhAX4pjYsmbgwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAg43sEed2C3Nx
-82SroEQ20FcYyTSC1un0iMlvXUoJWHFoemojivXGRVbc0VmBGJCJYnAMk4j8N+G1
-88VNXCurAkpgUflE120Txm+DjstzEWqBdZt48cJz5EMMXsw4qiU8nQm2HAbtLCsF
-EQGTneUCvdtjLDrJ6y4zZaUQ5rh9FRYW+bjdiOZjNzbzJz9jq9fTtQZP/4hg+gMi
-X4mRXIovhbA6yYW88OpWpBFezvxJw9JJNpeyNFTLYNcWQWxMOz+vlfc8+XAM2mqu
-xAdJghPoyXJEs0hEwTfu5clQ/IMJh2McWXz51DP8rz2zFPS98Vg/8+hx8Duq/vZu
-wU/tqR4wQg==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAIMgnywHFbPzJ
+BEcbpx/aWQOI2tUFlo7MUoPSoACHzoI/HOUTx25eKHlpNK2jSljLufhUd//eCCXg
++OQt4f2N/tRw8gumbs3YDF7+t3ZNGt+iQxZTwN7MKsGIZy+6R523XHw8lpzFX5iz
+XgIS+0APlX+XyZk7MRCcBWh6PSaSqEOOvUXVp6Omh3it034kBWnm809TEWmwiVw3
+ssPDmpUCArdDNMMdvQehzaH96cdjcSsguqpX9NcMDUmmiG7HLQ2iy+WSzek9S46S
+bKKDLw8Ebevfkl6PEpg+GDulq+EPXayN3AsFXkF8MaFLgfeprkENjN1g4jM+WSyN
+6DC7vCkj7A==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/test-int.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/test-int.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3TCCAcWgAwIBAgIUa0X7/7DlTaedpgrIJg25iBPOkIMwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE1MDEwMTAwMDAwMFoYDzIwMjUw
 MTAxMDAwMDAwWjAcMRowGAYDVQQDDBFUZXN0IEludGVybWVkaWF0ZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1
 SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+
 zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYL
 K7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwc
--- a/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
@@ -1,22 +1,23 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIUDfDBuEnXcajijQHlssAn+Hz8lNIwDQYJKoZIhvcNAQEL
+MIIDqTCCApGgAwIBAgIUMRiJ9TrwqTOoVFU+j5FDWDWS1X8wDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbVGVzdCBJbnRlcm1lZGlhdGUgdG8gZGVsZXRlMCIYDzIw
-MTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMC4xLDAqBgNVBAMMI1Rlc3Qg
+MTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMC4xLDAqBgNVBAMMI1Rlc3Qg
 RW5kLWVudGl0eSBmcm9tIHVua25vd24gaXNzdWVyMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo4HCMIG/MIGIBgNV
 HREEgYAwfoIZdW5rbm93bmlzc3Vlci5leGFtcGxlLmNvbYI0dW5rbm93bmlzc3Vl
 ci5pbmNsdWRlLXN1YmRvbWFpbnMucGlubmluZy5leGFtcGxlLmNvbYIrdW5rbm93
 bmlzc3Vlci50ZXN0LW1vZGUucGlubmluZy5leGFtcGxlLmNvbTAyBggrBgEFBQcB
 AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZI
-hvcNAQELBQADggEBAFuFZuHpAcO0Jn8Ts8uh7FzfEhYaS6RNAA9bZdHx0fFd9KzP
-CIa5wouiswFnHiDGOJnrBPoRkpDSwKzbkQiOjbRjuU8hBh4TXaw/Ag0Pv8PW8uUy
-SMP2bFotsYBUR7K5qYUPHvN9xRHQbobYTl8Gl4lQp/f1IOjqYLEliafU+wAIsEMt
-i9jLHsn0vZHFf1v/ZB4k+DaCM/94VXiwYk4PLIpRRmhAdNsi6JqdU/v65KahITRS
-CYWVwmtXy/Lt2f0zeNJ3e+enz3x18AFbsnOapK+UdbpVWyylwqCS8zYnH0qILJs7
-3ja4SL9iz+htj/WMI5iVzOqV5cRabFj6Mov2eC4=
+hvcNAQELBQADggEBALAnJjBJ+MOc7kMRzmESYZRSxKak7A1K67xBXWzWmK3t3WXv
+e/RLjV/RhbyTN20h2ZjSVcuDzgNYC/RJ/z3Xd5Q9QEGoi1ly84HeaeHw/3kUSHxv
+J3JnbPu2lk96U5y7tXEVfbEVZYpx4Us72fuURPWriVldILH2lgrEg+iKZWbY/wcT
+vfu1j/flMkGEOpc1HytlmR9fkCDnqzFfcmv7Eh3X1BiSBOIemGnUHxONwlthSE68
+IItE5l3c82G8oQGmve6r0N9h7t6opIjH1koFWMck/pzDA01FmWey4ASdlmjE8NSJ
+Al1zsF8EiLOZeI1rvurcXwVOd0Olk9/QT5hwTkk=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIDNjCCAh6gAwIBAgIUGTh5myT/JfbNsso9a1ZhGr8B11gwDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDExMDEwMTAwMDAwMFoY
 DzIwMTMwMTAxMDAwMDAwWjAsMSowKAYDVQQDDCFVbnRydXN0ZWQtRXhwaXJlZCBU
 ZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP
 8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OI
--- a/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIUF/Gw9/reFw2GP/YUul3+ukrvJb4wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVUZXN0IEVuZC1lbnRpdHkgd2l0
+MIIDODCCAiCgAwIBAgIUU/5C0qA0wzd6AIc9h4O9NYTcXCYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVUZXN0IEVuZC1lbnRpdHkgd2l0
 aCB1bnRydXN0ZWQgaXNzdWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptu
 Gobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO
 7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgf
 qDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/yt
 HSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcx
 uLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo14wXDAmBgNVHREEHzAdght1bnRydXN0
 ZWRpc3N1ZXIuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAB
-hhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQAfOCFN
-gUdGWTY2dN9dL4QiHVMJ16mHUXVeks9X0id/2XDw/Rgqk4snj7KaESQnKzVq7SfI
-Qg7MhDcpkAjjtWM2rk0pm/yneQhVk2EO7ogBNlrpMrKU5bsVf4VoR1+oOe/qDjJ5
-ZSOvVYcyBazWbCihadTGQBOp/owfZm8TPk9tF0wiab7rx+8xiYdgFtFEKAiUB2q6
-DM9G0xpxqXLpQ9oCJJqz1ZZEQAUrl6RDSg37SEe5hUTna+2nqT5H94G/QgvzQedH
-JVpbckXnsp+GvVdT1rGo2FEAgsKBYGRLHBfm4PczgzK1O6IvnUKZaQhDqO1UVrHx
-fkNYAnUaTtteYNUO
+hhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQB9I2Ib
+7B4vToHPZyNt/bUaIJbvp/rI2jeN5KS5kyZjaJVafGXnkPFjedRKTqxTRVq5hWAt
+5rQsJWBlqzOyU/JkZcnOny8Fz/gvGoJb7DF143Yi9nxqsTQWf55Vc/xeLfWqhMCA
+0M06aTSQpgDCUzbMjGC0GErqrBbVRFdOHb9gjqQY9mt7EgPCP9hq74tPR9hA06Mz
+iqzhLvFRzzJZQ5onq2wbIF6UZXneBjzHXAq36r3EGFALWk8kTf6T9R0pW1JOjaND
+pL+qzuNj92PlzAUoD6kHXvFo+Xf0t0iTWhzVOzMp+gDt8lH3acOHImM8nUitF/VG
+bsLrO/OjTl89wOz4
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
+++ b/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICrzCCAZcCFFE9HNGx5k6pwZCGb34/jyN8lJE7MA0GCSqGSIb3DQEBCwUAMBIx
-EDAOBgNVBAMMB1Rlc3QgQ0EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICrzCCAZcCFEUgsHxYoEbqPAebh600i/kCKUVmMA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB1Rlc3QgQ0EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHVjEgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAYk6jwXNuENBcQnVuJWcScQcl/pn707Ncx8XjA8W/LEyonx3+gUoG+L6YcbSU
-dDqc2n58tAXfh4trH3XxmQxwdJSBcuoRbqE7diFXpirkzfSWsnaLviZeueUPHbzp
-1tleBDQW36KuHc/MV/0eoEupDY8sJzaTRgZ3/PxX7/asVnUKESqtu+5YQ4Q46vpG
-C3pkduVtNwfX7LTZLIf6oXyooDiSMuXeCfb+dmeTYlsXvejQxiOXmacn1Eav+IRN
-Uxdzyhao71NKk52/e5rIuOeMrCyDKSWROpdyI0HCjn5dLdeURVkBBGo5J8AcVgMx
-l8e9GQzzfs4rS4jEFU26JlhWlQ==
+AQEAkiNDrCEjLxynRWdLOgJ/lnITYCHTdGhQg1H+fyoEngUW7WovABLSQ2ozb9Vz
+kFCRjnTNYRjJ7T5D7PS4ZrsWHaFXE14dV78rn7sX+OAqIIf+3Tir/3URWwIjxKhh
+uKDZWP7YPOgPdJd2eSOYdJhtOHeP6TlREmJfvvWRUvvSnTC7Wa1leJJ4vzN/65CD
+bDpKeP3aJ2ZaxGEQmtZs6yIeWE0BEztgqxq6ws72abYcQYwFlNh5LeA4Z59XJlFN
+oU64rZKC332lp4qOiwawK/K2y5oZ/OL+N8+uo/QsKQBopRcXl6ngonL+zO4ZGkTF
+3HwFXg1O9wdp7olx3+h/mqgy8g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUcYq9LyATGOqic2ewPbU/ayQ89vUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDRTCCAi2gAwIBAgIUb2J60U1tcE6yv0N5Nc0fd2jiMRswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
 IEVuZC1FbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjcjBwMAwGA1UdEwQFMAMBAf8wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMCwGA1UdEQQl
 MCOCIWNhLXVzZWQtYXMtZW5kLWVudGl0eS5leGFtcGxlLmNvbTANBgkqhkiG9w0B
-AQsFAAOCAQEAY3TYjwp6cbbiSuVCf/VI2necDDkvOFW3qwhd8YDxwgbRSE0LhbGG
-YHzM4C1fXlxBg1HCFUmbjBYDc8ZMxcr3SNHjpRbDxYd8Gq3NvVQUHQZaChEqroln
-PYgYY3s62s5KxMgd9PHPAXXDxm4poDYAU227wQLPepeS6Jfk0Igz/h7v0ThP62Ei
-e/mYVJXHO43VJq0U20FosJpz7qXD3nwir4z22y0JKHg9AV9pmih7xcyOxEEWJSVm
-VkfM4n+Xgm53znFiRY12LzccMV17vH6jeq1ywkOIEv59pHl42/cYeMHaodth20EJ
-6KSnz5xBmaXfGEngKEwm5jljidsqor0wPg==
+AQsFAAOCAQEADiYwmHSjgonXvA0uBWkG0o+D1z6DrDMWDAG0qIcn1H7JLMzF38TX
+4ytWn/NKyN9r1mNzl0dRBLja1SMUDEAWARtTL9CfHHDKvp/yaLySaZ5SHgqmNZ+B
++av7Ql3UStWtu8yMm4u/wcguJ3G4SUFRWWwwQ8Lw9gAi+J5LfE/3Pv5bw/QDovNI
+JhZb71sdAx0FOEfroPR04QUd0Nbt1GxtomVE9EDT6SkcWsJ65zX8eOblAH4f/J0h
+7LIhWFyZv3H4dRqIMvX8FZrqvy55rjEkyg7CYhVgnOoPZ2dhTt+mTmqqqc76rfj9
+pamqv20tuRakf4GHYSZVWUrh2EWFnVrZNw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
@@ -1,21 +1,22 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDiTCCAnGgAwIBAgIUWbWLTwLBvfwcoiU7I8lDz9snfUgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDiTCCAnGgAwIBAgIUDUo/9G0rz7fJiWTw0hY6TIyPRSIwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjgcow
 gccwgZAGA1UdEQSBiDCBhYIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tghUqLnBp
 bm5pbmcuZXhhbXBsZS5jb22CKCouaW5jbHVkZS1zdWJkb21haW5zLnBpbm5pbmcu
 ZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5zLnBpbm5pbmcuZXhhbXBs
 ZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxo
-b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQBE+6IPJK5OeonoQPC4CCWMd69S
-jhwS7X6TNgxDJzW7qpVm4SFyYZ2xqzr2zib5LsYek6/jok5LPSpJVeFuSeiesvGM
-xk0O4ZEihPxSM4uR4xpCnPzz7LoFIzMELJv5i+cgLw4+6cINPkLjoCUdb+AXSTur
-7THJaO75B44I2JjJfMfzgW1FwoWgXL/PQWRw+VY6OY1glqZOXzP+vfSja1Soggpi
-CzdPx7h1/SEEZov7zhCZXv1Cenx1njlpcj9wWEJMsyZczMNtiz5GkRrLaqCz9F8a
-h3NvkvPAZ0oOqtxuQgMXK/c0OXJVKi0SCJsWqZDoZhCrS/dE9guxlseZqhSI
+b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCkguNhMyVCYhyYXfE22wNvlaob
+K2YRb4OGMxySIKuQ80N0XlO+xpLJTs9YzFVY1+JTHNez1QfwP9KJeZznTzVzLh4s
+v0swx/+oUxCfLb0VIl/kdUqLkbGYrAmtjeOKZLaqVtRH0BnmbPowLak1pi6nQYOU
++aL9QOuvT/j3rXoimcdo6X3TK1SN2/64fGMyG/pwas+JXehbReUf4n1ewk84ADtb
++ew8tRAKf/uxzKUj5t/UgqDsnTWq5wUc5IJKwoHT41sQnNqPg12x4+WGWiAsWCpR
+/hKYHFGr7rb4JTGEPAJpWcv9WtZYAvwT78a2xpHp5XNglj16IjWEukvJuU1W
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC4zCCAcugAwIBAgIUNeudc8T0bIjlTNtd/cwytVrw4RwwDQYJKoZIhvcNAQEF
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC4zCCAcugAwIBAgIUD0tbNtyYi5o5ReKqiHJRxzHbrDYwDQYJKoZIhvcNAQEF
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAoMSYwJAYDVQQDDB1UZXN0IFNIQTEgRGVsZWdhdGVkIFJlc3Bv
 bmRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMF1xlJmCZ93CCpn
 kfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJisSjs8H2FIf0G2mJQb2ApRw8EgJE
 xYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF2YMTud+vN4NF2s5R1Nbc0qbLPMcG
 680wcOyYzOQKpZHXKVp/ccW+ZmkdKy3+yElEWQvFo+pJ/ZOx11NAXxdzdpmVhmYl
 R5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzSg3UTH5MrEozihvp9JRwGKtJ+8Bbx
 h83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0YxMC4xo/DdIRXMkrX3obmVS8dHhkd
 cSFo07sCAwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
-BQADggEBAFaCYg5FF1gv28oe+BztABq5Moj+wO9Lxk3BWG49PU22+c5sOzUdwEQA
-HwYJAG9z1EggE7hYspV8az6L8qJQEEnHW2A/wkucH+giUuKaWFyjKiA7Y++LlmLG
-73To/uTDsG7DtZsY1+GVe6cz2t6FmaMZvItoJtx0uA0QA0x1lb6P+4fD1In0hVVJ
-HmKIIUiwgk11KIcK8kLY4kB6vsc0B20qJO8KgSEOnXqU8+2od6KgUetwUy+yWM1L
-NL3LRd4yOPokCYhhDRDIJHk2Uo6x4Kq2H6/P48dWdttqOXHhtkWnY8d7GATGgOBk
-U1pnAxUsriwa5/mc/9CWfZd0es7JBNw=
+BQADggEBAHdut6BorXdFMDvWNMUxMZIvu23/4ikP9Glwr7Tc/3SHdVrojodGgICq
+TgHplU/JNaYY6AkhUSIm3thLzyUozCE647aEF/0REKbla8Jqob3PXtHmQUlQDZqm
+dabiY68KZH2xqCAj45GtoRukzc8ypCNZeRTAFDr0NmUKSRSyvsRXDC2mMyaCrHwm
+Yv5l+ZBfdkUpj4RMKj/7WNApAST7BZ8Jkvc2Rj8S59XpPZYpsw2eqBlKfVO4XLqc
+0nSC2Gal3NnPpjDsYtznxeJ0qRO0QuQqPLT1MzioI9C3thbzbgD84qhcZA7i0YHz
+c5oWlTSYrhCciW5DQg3+w+r5RUlidng=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC3jCCAcagAwIBAgIUOffmpHWxTwOzkv2FDsDeQOErP1kwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC3jCCAcagAwIBAgIUf68Vz6ulR18aiFfzE2Fh0iK+qgUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhUZXN0IERlbGVnYXRlZCBSZXNwb25kZXIw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBdcZSZgmfdwgqZ5HxuHbD
 f1zlOLBsSs0iscvUb6Za2irdQcjCSYrEo7PB9hSH9BtpiUG9gKUcPBICRMWEpMRI
 MwXlE4wBBs8IvpqGJ2C65qLo828jxdmDE7nfrzeDRdrOUdTW3NKmyzzHBuvNMHDs
 mMzkCqWR1ylaf3HFvmZpHSst/shJRFkLxaPqSf2TsddTQF8Xc3aZlYZmJUeX7UJp
 CIgIEUIgaZiKQ/7kjOaHgd0itqac0oN1Ex+TKxKM4ob6fSUcBirSfvAW8YfN1U6D
 KzW4kw90upCqi8dhZyQqsf1tYhQNGMTAuMaPw3SEVzJK196G5lUvHR4ZHXEhaNO7
 AgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IB
-AQA/VVuFpN3OYFGlIlEVKw9mGdZpcF4Dl3g1R/TCM0umnp6WngaL4O8GfOm88idu
-QlQX2lkLiqQD0Wvr3SFYhK9nuXrKQP1xO8AutaTlBziRXSfwHbsHC1bAhtXqyeK3
-FvJ6TfjSXWCTZRztXpH/H0lpCQhplhaVY9SPt7T0I/ePzO9dYN/p2Tmu5whP239Q
-IRtPJt5XcjFfhwre8ab1OOvC2Kt3oZZhZGJu/M6WmrhXUzw0fmQepaKXWFXunP3M
-a7f56raVnftFIDYWWXIZ9tqQfMdz2Db7Fvu91qC6+W6wy0JDzCf3FP1no76aNr/A
-Mo91gV6q6gwvyb39wFagjdJ2
+AQCbf6GthZglrsqEKYf2mmAJxwcEAntQZIbSY1msnwzKLvpNd56BLHsI+bpRuaOY
+LWrQumNfEI6joSZDHS9gyshodPAQ5oRCmjlIaiCVHkBt6m/Y9+3pFvsSDuJKx3HG
+I6UGMHKqqTNLW4lYaQwFOICnOpgH/KGdAYuRHECVfuZhVAOw2KLIM5vKQjDBp1nn
+7YWncCMTnlbNc5PALKUqQ93xzNxqEHIk54Zr8rha3dn+NdX0ImTv5Jz+RGnNl1aH
+hRhfzrgcYiESL0JJCdhKdTN1SqqsnxzVvh56bGOyroUnQ+QYgo2IIhy1amqpSsl/
+Q7//Xk0KDVFeNCeP1CwAHbhO
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDAjCCAeqgAwIBAgIUI3+dlah4Vz5vBd2eKb4LMlIHbtgwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNjExMjcwMDAw
-MDBaGA8yMDE5MDIwNTAwMDAwMFowPTE7MDkGA1UEAwwyVGVzdCBJbnZhbGlkIERl
+MIIDAjCCAeqgAwIBAgIUD4B/rvM3b7Tz2IB771EYSvRAEJcwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNzExMjcwMDAw
+MDBaGA8yMDIwMDIwNTAwMDAwMFowPTE7MDkGA1UEAwwyVGVzdCBJbnZhbGlkIERl
 bGVnYXRlZCBSZXNwb25kZXIgRnJvbSBJbnRlcm1lZGlhdGUwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQDBdcZSZgmfdwgqZ5HxuHbDf1zlOLBsSs0iscvU
 b6Za2irdQcjCSYrEo7PB9hSH9BtpiUG9gKUcPBICRMWEpMRIMwXlE4wBBs8IvpqG
 J2C65qLo828jxdmDE7nfrzeDRdrOUdTW3NKmyzzHBuvNMHDsmMzkCqWR1ylaf3HF
 vmZpHSst/shJRFkLxaPqSf2TsddTQF8Xc3aZlYZmJUeX7UJpCIgIEUIgaZiKQ/7k
 jOaHgd0itqac0oN1Ex+TKxKM4ob6fSUcBirSfvAW8YfN1U6DKzW4kw90upCqi8dh
 ZyQqsf1tYhQNGMTAuMaPw3SEVzJK196G5lUvHR4ZHXEhaNO7AgMBAAGjFzAVMBMG
-A1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQC5Yh+IEttSJejR
-r6ih2JUPUyFrPFeDDgMKxMP2O2NpqOUPtZbGIc1dXAmLYuexa4l543hgGGd4Sny1
-m0FohQOeJ/16nkM9CkHzsqdLY+mHJfzfaKXRYDpRt4/nkBrM7neTfiTk5tDtTn8D
-QyiDIct/2Ci3q+GziijyKKHeR2x00ZspHLl2wrtHRfL2xNXYImMD8r3rHTJnrudc
-n8uoHVRdAYVKkytPTIHft/dEMjAoNcD0FrXgpAiqcJxsEEZ2ULFItTCKSvXHUf7g
-jDMcXNanE0RUNtaoeoj3Mtc9qfoANXY2h4VOrAzMqOaLU+0pt+kOHqjgzu3k28aq
-biAVtAeQ
+A1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQCRUG+keyRi4vZR
+aOPRjoBcEqxXYCxDhAb9lOaEOlxRjzYSNexxY1MOnLLH5HSXQu1xkyw2dZ6JYxMY
+fkCHLN7WYECrQgZfyTfQV2zozpp7hNOF1/OKEYx5f1fsyd7cSfzaJTidWMacX5IK
+3XPWL3nx40h3LPWlVeWBzbna3gw63F6WqapoNX++jpqPjjEtdQBkxN1YxXU41m+N
+pvM7uYr18HptcZAY5yKNb54jqkgGYBYrVIUMAZhbdFM2oTqn8ANEotBHz5FD0AsZ
+PD/HV0N4QbCmGCQyMV3LHjSIfMRO+eTLhblNr2VvKvgJUZrgCHsu2ooS2l06e3+k
+bfNi3yEP
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC8jCCAdqgAwIBAgIUDda/J7s7/3vx/e/5g3mh4X6R+QMwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC8jCCAdqgAwIBAgIUEfpE7CgExRkNa7hmKq7AYULNmd4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjA/MT0wOwYDVQQDDDRUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBrZXlVc2FnZSBjcmxTaWduaW5nMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAwXXGUmYJn3cIKmeR8bh2w39c5TiwbErNIrHL1G+mWtoq3UHI
 wkmKxKOzwfYUh/QbaYlBvYClHDwSAkTFhKTESDMF5ROMAQbPCL6ahidguuai6PNv
 I8XZgxO53683g0XazlHU1tzSpss8xwbrzTBw7JjM5AqlkdcpWn9xxb5maR0rLf7I
 SURZC8Wj6kn9k7HXU0BfF3N2mZWGZiVHl+1CaQiICBFCIGmYikP+5Izmh4HdIram
 nNKDdRMfkysSjOKG+n0lHAYq0n7wFvGHzdVOgys1uJMPdLqQqovHYWckKrH9bWIU
 DRjEwLjGj8N0hFcyStfehuZVLx0eGR1xIWjTuwIDAQABow8wDTALBgNVHQ8EBAMC
-AQIwDQYJKoZIhvcNAQELBQADggEBAIQ0Nvnqd98f4u1lhw3XCaOdSyNcZfEZWCD/
-I4Nu87pVPV5NSBHRA11pZ8rn1OCAAI7ZYqmnLecaHXVXA3/45WPwzPt7BGG3aPuf
-4jdu/Rh6IQLs4E5MeFsyRD1jFt5MOEjobf4QtP99swnqXSVRjjxypIjfSzGwRW7O
-ZdUCOKyKwjIpOd0fUmGUgYUv/ppANKDGxlpED3O5vS/10sa1BziMceQd4QzynkKS
-aBKuPcW9U9Vyl0Brvwi3AvgWN5YtIvwuIRG/iD4T8bdSJ+SGjZQMRVSKCwspGD9v
-1xE2hTfdh3CutDrAdPOve9NKp1gwIQYP/pZTbEYQ/HIEkzDKe2E=
+AQIwDQYJKoZIhvcNAQELBQADggEBAHLHJOUO2KLIcFKkmtFXFGgjxaNH2Jpjzq7j
+n8s2VuzSS3eNI9rLLOl1dKp4vIrXB7U9zl63KFhtZS36AQI7EbC4ySmopuw5CRmc
+oI84Zu5Vbp9zikUHqQ1zGircyTbUZnmnGCmcVHtYyGZaaO0zAKseNPE02u5ds2W9
+rtAPktk6MmdKFjfyYtzwoA5pcoE1vEJbEJpqoE92aot4xRhMypt9rweLo0h2hD+G
+vUsO0Xqp3USItCZQZTqZJ7d4soJPImSfEfqcQ6HIieh0pifAZdZvhxI5G2rjCTcc
+L2vhWjvLfjwZun1dcoiRvSQdVO32bTiAuBbuNaSc7SB0xHogx+E=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAcSgAwIBAgIUK4SYyt6isVVlyyY+Vbp1ic+BP24wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC3DCCAcSgAwIBAgIUBwWgzfCzns/pns6h1gXNfCAX54MwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjA6MTgwNgYDVQQDDC9UZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBObyBleHRLZXlVc2FnZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBAMF1xlJmCZ93CCpnkfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJisSj
 s8H2FIf0G2mJQb2ApRw8EgJExYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF2YMT
 ud+vN4NF2s5R1Nbc0qbLPMcG680wcOyYzOQKpZHXKVp/ccW+ZmkdKy3+yElEWQvF
 o+pJ/ZOx11NAXxdzdpmVhmYlR5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzSg3UT
 H5MrEozihvp9JRwGKtJ+8Bbxh83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0YxMC4
 xo/DdIRXMkrX3obmVS8dHhkdcSFo07sCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-J6EPIAySlNzI9rrEfAoG8AvPfDxxbvfBgJ4tFWyl4izHyaleq0kcCuZJ8IM3HtFm
-TfvcaQ2Zt95Gq0UBU3SZXin4Lg0JTUTJfKOHsENy2U3d+NMwLpLa2wt6PMfG1a/7
-+uPLWD+OdngJqo8MxdJj7bw7ae7WBRFjLN0Xfh36qkKOVG5B1cGa0PWiX868Y0wD
-kr95uZbXYaRGK7+pYPpONbI9c+9Pqug4VZRPYQP9pcHiTw5/Iz3SYw3UsRO5+zcY
-tipg2xjBOa9Rvh1gGm0tXaMth3fwrFBbjv7aaV0cm1CgPBAqjAWjlZQ+Ibsr/0BO
-sEAy+CaeuhyDMnOfyGzGeQ==
+obSSvusym0QpS2ygODQTgSx02KXtUQqq4uLu/EA60PYie97BDFQ3Ld2GcB4Xr2Ut
+VHX1jfkKaO1pXOSKbQVb+qe80yC8GZ9G6g53Ar9n0mr1YB2SCvoJ6ny0MfZFKeU8
+BtpIKq9XztaYhHcXdPpVrUbxQagFR3mT6e5T9fyvg4DmqA4OUD2WvLJy+gVAf5LL
+XwDGND3hJ3UvTCjSVv1o6pSrnGkmdBUnJOUBNXbeec0GefuTDiQy+D54AmTfQruD
+sN3+JZz72GoWN99kQPTvwWb9PjhCDwZP0F0k666SscCbVsUpPIIRiq/QZaBnaIUo
+aS+JaVc1BYRL2rHT0h7D/Q==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC+DCCAeCgAwIBAgIUAQX8to1fTHlwLRhdVcIy/vhGA3wwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC+DCCAeCgAwIBAgIUKRewwaIudnTsMUEkehPOvGk6VJgwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjA9MTswOQYDVQQDDDJUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBXcm9uZyBleHRLZXlVc2FnZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBAMF1xlJmCZ93CCpnkfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJ
 isSjs8H2FIf0G2mJQb2ApRw8EgJExYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF
 2YMTud+vN4NF2s5R1Nbc0qbLPMcG680wcOyYzOQKpZHXKVp/ccW+ZmkdKy3+yElE
 WQvFo+pJ/ZOx11NAXxdzdpmVhmYlR5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzS
 g3UTH5MrEozihvp9JRwGKtJ+8Bbxh83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0Y
 xMC4xo/DdIRXMkrX3obmVS8dHhkdcSFo07sCAwEAAaMXMBUwEwYDVR0lBAwwCgYI
-KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBADS5nyvySOdGU3YQEQYf6Q0mjZYW
-nGqCoCNBIHuw1njeRraUxe0ufZFPRXOO1MLBkapa4Rf7jjjwpDdH/u/luyuUSCGb
-hNHtNc+G1wMo3aWzLitUszgZvlpx6bJj4L1avgTbHXkMJbKYBLyh4+WMG0gkcLnG
-ckERCymPeNl7E0DtLp7UwMaBCv6WOZrYBM152JX/yqNxx6h/iCmY3/nnNFHlEIjv
-MQ3eR+jimoSp6oy5tuiIeha7iNOXwuUsi+UFFXDh03j2EW1AEoQHNBX2m7mmXkZq
-2JSEycInhlKYWdTAdvPKwLoKWZ9EWKNBWBqjlcMXJs0NTFBn+PnNWCwG4Pw=
+KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAEZN/GwvtMtRqYJKGGzLCc7CLPW9
+rYE/BVpOWSQuQLDk50EfO8JpV6o3Ist3xkScSYOosRkri4115Go04uh6YTw1aTsv
+dRAxXgi/914cFqnGFGW6E/IDAgkk9mdo0Z0trleeyMUgSrUix+HiDh2xa+ukShbX
+GDG/cvxq0jgCtMjJfpABefj2cEtbZFe9SWteMqNyxCKpuQV4wPB2yIuUZUf3zhBq
+40+158fMezg9o9nlIhzVewuXNL6zBIREOFDqsRQay8c4Ho1Hla7GZKjxbZZ9dflI
+zLDbMEqiOXdNO6p5fxb/L9Y6GKiuMvIcIn7ejiOmccflvEGE5edKeCcCYEo=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDJDCCAgygAwIBAgIUCaCQxKwqnVqKekWFAeGn6MmE600wDQYJKoZIhvcNAQEL
+MIIDJDCCAgygAwIBAgIUaXQ7Uzd61PtsK3dHyj0HHvXLfLMwDQYJKoZIhvcNAQEL
 BQAwNzE1MDMGA1UEAwwsVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdWx0aXBsZSBU
-TFMgRmVhdHVyZXMwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAwMDAwMFow
+TFMgRmVhdHVyZXMwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAwMDAwMFow
 LDEqMCgGA1UEAwwhTXVsdGkgVExTIEZlYXR1cmUgVGVzdCBFbmQtRW50aXR5MIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
 DY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQ
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABoy8wLTAYBgNVHREEETAPgg0qLmV4YW1wbGUuY29tMBEGCCsGAQUFBwEYBAUw
-AwIBBTANBgkqhkiG9w0BAQsFAAOCAQEASbAj/f4tEK6Iy/cpOJrC6hy1ZGcolclg
-CbHp8Vbf2h73Yjk3ED1qnXfGKbyha8v5rCUR1bbrlnzSqzxvp/v9Gt3eRaJpX1Tb
-qahsyRGhbtYunq5/1XhtzwFsmNXMVhKD32Lc9KFywDQklU/P+DHqbQ0tYYSXKB7d
-ntLpSb+hyd57K7KHHTfKW/gg8coNNFgBDQdjMhcvLcH8Ama5ZaphBhaBnvMf1ugk
-f1uxrANDVOotucQw0hJpHHOA9sQxzzxrMnPvDOAnjIXvCMs47fjhwm6OvSqQyiOV
-wyaOsxUOLi0pkAh8OhUfPpWwVXj1D4oWK/5IKo4+1TlDO29aIENGuA==
+AwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAYbOwJS9nHTBDYNz1ZDdVyzIPQed5UmPG
+AeMJ2Br6KbIjEM8B0SLI8Bgcqr+Qao2lkHfqirSFDHxCdL0JzzuoX/NGKJ0v0Gu/
+t/LG8Kq4S137rCPsrEHJFjdIjZxas8ZT61jBUMHfcnSamBIgOByM/oQLKNvVJPwx
+5oeA4uxnUC/V4FuUr4BFlFGxdtSvUlE+W+xgWvXriU/BnTCwfxZPp2pY9J/B49kp
+OtgukzwXoCpqha3OZj1Zw+EI/Karab7n3w65F9DxyouKSFQDNij00AyVIV9iek73
+jnRlkrw3BY7ZbHNOl3L/6m/C0mJBisJ9Cy7ws0E9hApOfmyyRlHo6A==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDJzCCAg+gAwIBAgIUVZyw9WgMwF1k01vIHfcOkOmAw7QwDQYJKoZIhvcNAQEL
+MIIDJzCCAg+gAwIBAgIUHSWkMnSKKGhu3nJ4I1ihQEmFTRgwDQYJKoZIhvcNAQEL
 BQAwNzE1MDMGA1UEAwwsVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdWx0aXBsZSBU
-TFMgRmVhdHVyZXMwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAwMDAwMFow
+TFMgRmVhdHVyZXMwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAwMDAwMFow
 LDEqMCgGA1UEAwwhTXVsdGkgVExTIEZlYXR1cmUgVGVzdCBFbmQtRW50aXR5MIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
 DY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQ
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABozIwMDAYBgNVHREEETAPgg0qLmV4YW1wbGUuY29tMBQGCCsGAQUFBwEYBAgw
-BgIBBQIBBjANBgkqhkiG9w0BAQsFAAOCAQEAlqj2xf63FEmTtedIouDz4F/mwzvF
-jyg+ALLbKH0E9yrNE7YBBiMTyZnWfGjnGlCPRDj0IeFk3VWa0KaTYZhVG+dnkhiL
-tFDhLSkggsfUVeo0JAlcwcMIF6gz+piljqIbgvUiupeio7FOrP83mVhioyzo8ju2
-nxzeKfsAlTo/IYxvsDvkbCsVfhd5Xi5mhhNgL9aALI8PRCVwSknKfqu7n4q0iEes
-dNhjpgNNnmkPDYIx8M+GzcW8MYtFqfM6/gk2uNq0b6a6DiWfnIwXo9tY11Q7dadv
-LqkQRl90mEDGILuIakA13xsbZ35AdImvtMf5YkqDvd7/txinF7KXK6Tb5g==
+BgIBBQIBBjANBgkqhkiG9w0BAQsFAAOCAQEAFXCbaS5zM+odQYJty20quk5RQ2ju
+r50djPK/5Ez4nfHcEe3hdb4VG3oGMoVctHYSGzuRhaYjUpYlKPDpF/ZyIXDcEH9J
+Ukz3umIIlNw9QRsQx0jLYJyfX5+hv7sKPriSKfsz0mYgIEA2V3jEGCt3pSoYATli
+x27pyZc6RuEFKlIubqZ4zmYFccbKEczNbJCk9sB6ONUGeRm4RT6UxYaRe7iYwLxg
+KUz8pMHGAhhNaqUu5DkigQ6TK+lEdODdIpXjhFcWrlSySc7D3ixA7QgtzJ77emAy
+zqx4uWKW+z2Jp4E3aHHDtXuc2kA3eSsS/Bi+3tFpp+cBGH5y9uNHU0cq6g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDCDCCAfCgAwIBAgIUMZRoPBbDNy1PBOnRP0Xd5tFON1UwDQYJKoZIhvcNAQEL
+MIIDCDCCAfCgAwIBAgIUWfiQpVw9DswE3N3wMlBvYMzsUHEwDQYJKoZIhvcNAQEL
 BQAwLTErMCkGA1UEAwwiVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdXN0LVN0YXBs
-ZTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
+ZTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
 DA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
 FYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+o
 N9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0d
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjLzAtMBgGA1UdEQQRMA+CDSouZXhhbXBs
-ZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3DQEBCwUAA4IBAQByN8Hh
-sT1oO/wXzEL3hIqJiNky3No50HDPyo6bH5kQd0ylRAWXtXZcq5R+1IBM1pB8oIzf
-jNHBiNUu/sTgnNR1EiGgbQgJfC6kbB7utTqQ58aR//AV2uPUgNUgEi14Zb6xHSwn
-PkB+z/SMVko7rV4AZFbMw4q+2fKuZyOPW/Hi9mfq3Ds9eMtFEGZkqfx7TKR7PBfH
-4BSW/e/W2BBE/jL1RPRHY13YBswyPtGPFlG5wHTk2d641Le+XsJpJF5rJbZ7ghRt
-oMBwhBvxre+YQQ3TljCcJY7GkX/5wxnroqSeUBFd6A/Ri3VY+nFLBzlypBJ1Qk1N
-SKu+IvjtFOS0r4FQ
+ZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3DQEBCwUAA4IBAQAsMPCC
+zhMYDV7s+fePyNu8oOSlxyZsB0AqJEfBpMqWjKFZrOgaG7k3LgSmsonoZA6bnTkR
+NOHiwR/bNeaOdGlsRgC3UN0vkyCByJLooq4LW7pFzKNbKtL61KlCK0/WOwjioIGg
+uC5xrUdupywewJE0EjRfqRC778j3VrrDiCfGqiPWfLRhpfErb2cKO3m6nW7KEQNW
+palHHNO2LfqrfvZlYW0GPZsYPnVOjiofuX69+y0rq0cDOOfJxQhZZeFS3SdwmQA3
+z0EGRGdvELooDhVrTQCrSUU2mDSQOr395KFPWOKgVnKpxGh8jQquvSAk4EeiBfJp
+cHeuNes9WCQt0ykU
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDITCCAgmgAwIBAgIUWwzX99VviIfZpt82zduR6Ne5agAwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDITCCAgmgAwIBAgIUZ/Yv/5fnvtcPM9jm+0zmkVUid8owDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjYzBh
 MBgGA1UdEQQRMA+CDSouZXhhbXBsZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMDIG
 CCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2FsaG9zdDo4ODg4
-LzANBgkqhkiG9w0BAQsFAAOCAQEABMnM4MBQ9fqyM1eHB1FSS7tOGWLJTSMZ2zrw
-hSKxm0N0qBcl6+EiMa+2FUxMmhyF4dMktQd45VFY0vidDyM5olubb9OUqjg4yB4U
-3nti1K5QtXD++lDLk6xBUvX4bsHwclStdnCnNPrvgZF5RYHSDp1HcB/Giywa3fZ9
-HFsghMBYWXTb78vuLOQGuZou7RcN6C5UthWzO7e856U4RbpWLn+eYucOFLliR2o6
-+u6Bq0A6NO8IeawG71ng1fafrp2PaErN61QocJN/B3iTBpoSJw4tyHeA/zzbT8zW
-U6zghPtK1pGdDz/eCKGbyYZrJmT5+ByAE+1Is0ehyVOSFG7nFw==
+LzANBgkqhkiG9w0BAQsFAAOCAQEAHFQjCKoat9FzAVlZuymSpJwLhkbZ1A2tlnBc
+s58ameauAoF/VA2I8pqzGDWwmjBoA13Ja6TNZPjXyjW1ffHor8UesB6TlehYPnOe
+sa3Ex8WLdlr/i2rAd2ILPqXJTYWxddGWtThlJRO1FLt7m/YLzi7+ASNvC9Mamnbh
+AyAwfvrvCxedrG2n82VizdAjyaNFHDVoPjegtD5tQAynfAUrM3Y/87QUY14CFwEO
+4MDN5r8ExxTbdm6mzUguGsfYttFcU5f1O8fJwiqU30yCH2cCvDlSQo6ouhYpf7Ye
+wWfgQrY3VR+jWD9qiyPPLeMiB00kc3bMtDKjyH9ATCe0iV/a0g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC9TCCAd2gAwIBAgIUExsjC5hjWV/0ZIrdpMxcu3rwpQwwDQYJKoZIhvcNAQEL
+MIIC9TCCAd2gAwIBAgIUSTKyoDkbkmxk2m1XVnhL6Ars/OIwDQYJKoZIhvcNAQEL
 BQAwLTErMCkGA1UEAwwiVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdXN0LVN0YXBs
-ZTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
+ZTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
 DA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
 FYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+o
 N9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0d
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHDAaMBgGA1UdEQQRMA+CDSouZXhhbXBs
-ZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIBgPUy76U6aYULpnGi1UP5jFgwujQjf
-//ShSBuKc09smIn+ywshQONPcWrOIwzzNM2eqSX/pRMk0mIf98cEXNvZVkaTnLgJ
-7Kc+hzcCA4C/SrQBzOXTTt4VzTYKiqSKlMj/MF+Qeh+MChie1p5ln/OpEeXJSQEq
-iXCVNMPU0hMqg1DhGWc1jwNzXeQS5dCUWUd9VWySlOA2aCvLfMBwMPeKcSphqGU0
-srQPmE/8kw+UnH+JBGTNWEIqpTDPGPSKWHjPI/C9rtqAmoQQo33WLLgV8DJMnQjz
-WfyhtRW8QiFP6Y9V2mpZTadWF1O5ri9kM41pxr7Ncyw4tZMW7o97Chg=
+ZS5jb20wDQYJKoZIhvcNAQELBQADggEBAINzD1u8BF2jyi/e+L1gmBZXArFPF54/
+aRJtUCiWVBN9zyQufc91VYVjH2kKvzKXj7e4+34RkKgyFQY4ViAOBJgIjmhC4Pmf
+qK5tZqlG/ji9mpcrIDR/zUwaqLhYE5jV/p+HP7zyfHscH6y8BUltOcwr0VeTrl1d
+MXINs09Iqg9yZrtrk40fCZ9PazTVkcomGeRtxdPsXj38/E9qIUejbS9ZDUVM+6Pv
+wRUkoby1VAaffZR7nmFapnSeCEce4ZkcwMf2adbOvL+fIUABmhKyqMK+5Zx5vSqk
+9+fgjbgA0pRatz5hfsguyhnZ1fjkfT/5aSPdLqjIhO8t/HqsYVEmQO8=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
@@ -1,20 +1,21 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUFc6Lad1gVo7a1kgZ8M57T34bIq0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNjExMjcwMDAw
-MDBaGA8yMDE5MDIwNTAwMDAwMFowLDEqMCgGA1UEAwwhVGVzdCBFbmQtZW50aXR5
+MIIDNTCCAh2gAwIBAgIUZ67hS7lHVnCQtXx7oXFlzihqh0cwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxNzExMjcwMDAw
+MDBaGA8yMDIwMDIwNTAwMDAwMFowLDEqMCgGA1UEAwwhVGVzdCBFbmQtZW50aXR5
 IHdpdGggSW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptu
 Gobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO
 7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgf
 qDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/yt
 HSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcx
 uLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo1swWTAjBgNVHREEHDAagglsb2NhbGhv
 c3SCDSouZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZo
-dHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQAj7JDW7kS7
-XleE54YCtZZzJNL+mO6laOzbZUXPjuaGxlZML27eAldtuWS/iBGpr8pI16/mt2o1
-m2ot7/p1QeEb4oxHMeXQdlVWQutb1rdanijwKq9iFms4u015lFC9yjt80X5HlMil
-GvXinmWuM3Qd93U/2v12A0Y+XcIOR+gtBFN8doWKadWVSfBAlGtmrVou7GHNcXG3
-lZCmJSxf/D3LCBLKgtaPzuljkbyZ9HVSCXiJJoDotQ2JnynmvmBNe8nhDnx/yZo8
-r8U4JB2A2o4zgR1EHlfx/Q7q5r9oTPfRh5ZjKn9FsDn4VEirxA9bE5PeJeFS4DQ8
-mTcmWqdgUi6i
+dHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQAo043hM4Gi
+UtoXKOQB2v0C8nF4Yyzpf+i0LlxQCFZkiLYu9pIuQu16I3TbLQRBwhCC0ml7TqJB
+AbryzILTorCQP8A1WQa1kt6cb30jCyXLcWnDA/ULPexn9cYm6I0YyLFlnkcVzMGL
+Fc+LyWTAPEW5rMauu5iOOp/6L5rBF0M9bg5yXSGNDv8gk3Jc+opJbBDTrAuKDNLp
+JSEp4rqovNFnirzlJWDS+ScAsWHtoLcrH6gnQRPsEV1WFQnYr3HkAakYQok9xs5A
+ikBS6mgz4/cFBts8bSGSuXxctkN2Ss7Y5l3YmTYKCxPz6retVfrhi/islH4W3z9H
+pu3ZqyACO6Lb
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDFDCCAfygAwIBAgIUMdoMkJtUNgoc9ytGJtKF3XruizcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDFDCCAfygAwIBAgIUJ727dY3tI2TtHc4yXNjYc9ka4G8wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAVMRMwEQYDVQQDDApPdGhlciBDZXJ0MIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo1swWTAjBgNV
 HREEHDAagglsb2NhbGhvc3SCDSouZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAk
 MCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEB
-CwUAA4IBAQAlrosjqSZTy7iUdbYoe1iAS03w4qWsjpfxTkQ0ZjTlAEDW968VOnKN
-AOcINnBkgppd3zwwLVGc2fn1QWxNy4brcgDU187wuH6FFIUn444k+i+sUqOwxssU
-18m6XxiLKM7nRiyxLP6EuVWSg8Aj5p2JKixkS+jnbANTaEsV7KT+2oFw3GM0FwmX
-Xbs/XK95FoBab47TfgTmAuieauJ8AJluflmhKVW9Gv1Traz+Lz2J//du1L2VoQH1
-N1EL6H4tC61G9AXiloKqps5Z90tM2Zap7vptZjRwHICv1OGxe26aQBh+hHqqvtiF
-zNHJQbtdtOXaSpG+Zq5OySE0FCfKW+/b
+CwUAA4IBAQC1BwZ+HiiZ4NONQa9SJghgdjbOqPAivqDJlS6VGZlV3ytD3wbyAdcf
+8J6uMp+xpNgOhtAdwVT3aLZBrftMQqatC/S/9G8JZ6qBMS/kdMtKnAQlOuFGxVFb
+Hy7iQjAupIOsDF1AQw24t3fOUpd44y2KKTzXvCUjnHvomM2f0u8ZdAJWSSt/7yVw
+aGrB75XWfSbOHq/owSC5/nLGMz6CG5cOyB6NSjrmb5vveE7yi2sc+7mj0O52//vf
+ni+FNdYK2TNy5Q0jaoBm9ZuluV5hgqUAg2BfbmefWSBnO6knUzkPW+FuxERR4aTD
+fPH31W+KXZ77m+jU+vrWnSJ8NG/yJ1QE
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAcegAwIBAgIURym6o+VN9xgZXT/QLrvN/nv1ZN4wDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE1MDEwMTAwMDAwMFoY
 DzIwMjUwMTAxMDAwMDAwWjAYMRYwFAYDVQQDDA1PdGhlciB0ZXN0IENBMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXXGUmYJn3cIKmeR8bh2w39c5Tiw
 bErNIrHL1G+mWtoq3UHIwkmKxKOzwfYUh/QbaYlBvYClHDwSAkTFhKTESDMF5ROM
 AQbPCL6ahidguuai6PNvI8XZgxO53683g0XazlHU1tzSpss8xwbrzTBw7JjM5Aql
 kdcpWn9xxb5maR0rLf7ISURZC8Wj6kn9k7HXU0BfF3N2mZWGZiVHl+1CaQiICBFC
--- a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
@@ -1,15 +1,16 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICazCCAVOgAwIBAgIUW7tFt6B7+5wGGng/SgNMaqjfJqUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIICazCCAVOgAwIBAgIUN2SCA1pAjEvOKmN6dSCne5H2f78wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjA1MTMwMQYDVQQDDCpSU0EgMTAxNiBLZXkgU2l6ZSBUZXN0IERl
 bGVnYXRlZCBSZXNwb25kZXIwgZ4wDQYJKoZIhvcNAQEBBQADgYwAMIGIAoGAANKb
 sS+4T93NKbOlGctmxDuNj4vlRbp5OEzmY+0D33WZFgDrkgeQ0lMM7OVE25mnHwWJ
 aj7SBxZVNKqZBX5HxH47yBrab6HhLjcmi1BGpVJo+drXzLSF2BouGdUNTwtoVKyv
 bXvmnZoIMTbhWvqPU8HIyE/GB3J53Q5V1zaaW90CAwEAAaMXMBUwEwYDVR0lBAww
-CgYIKwYBBQUHAwkwDQYJKoZIhvcNAQELBQADggEBAF3eU7urgunG3o+hg29ad9d6
-nTkk81pfUxQFJgSsCPpkPhg9mZXKn2oxKkUXT2Yyr2KHMtKdL9/XfT9LCOauUD2f
-Hrd3ttZv18W4TfIpckl14Mgv0SOKPHe1CJyHWSnKa84DG1vDet6M+9Rl4h/ApuM3
-w1zp/8bzdsEKau41Mc34m7jdpT4pn/HLQv9Q6VMCyqJXyY7+2PS3Nn6iWroMGKmP
-4CK+d8iU2nzTkAJtPUbIzl7Aq/ATeMUcZegLBuhe2uiDKBQ4Eo+He3/qsWCdGypc
-9/Ue5v4CyJzzKt07qfIBCtRf8Jyfmy9tcwBrxHTqS34honQCKvS1MjuKKRS9Vww=
+CgYIKwYBBQUHAwkwDQYJKoZIhvcNAQELBQADggEBAC/hqhKMvd1WRod1JtP4NFsF
+mi2KGu4iQ6Tl3H61jdi+fV98wBRjUOwGS4jQDYAbpHN/iuKn/tYJLs67qOp+olXL
+h5D6kWKRHH8rn+yuyc9SITF/VWMVQmZ1qrO673ESgEMiibtD0jqujVSTFnj8mIir
+MoIk/ghN5NuzPBB9l5RVwwAla7q5tQwitVF791q4mZIwraZMZOUNgkZyZvSa0J9v
+LAOj4Gn15OHaepzdD87CFW0TsLboEBSyF6JNiQC5icfpT+zJWTKuDFfYEm6qn+Ze
+KvVYbm8BYWQ56nRXq6iyRoRNtj5XeG9B5OSWx0ZQE1mDbz7mISwp0s5+Kop3jEE=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUXQU77wu7MDt3G1ViBp/+eg60PnIwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIC0zCCAbugAwIBAgIUKaFwIwCwHXUgKRuOhAX4pjYsmbgwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAg43sEed2C3Nx
-82SroEQ20FcYyTSC1un0iMlvXUoJWHFoemojivXGRVbc0VmBGJCJYnAMk4j8N+G1
-88VNXCurAkpgUflE120Txm+DjstzEWqBdZt48cJz5EMMXsw4qiU8nQm2HAbtLCsF
-EQGTneUCvdtjLDrJ6y4zZaUQ5rh9FRYW+bjdiOZjNzbzJz9jq9fTtQZP/4hg+gMi
-X4mRXIovhbA6yYW88OpWpBFezvxJw9JJNpeyNFTLYNcWQWxMOz+vlfc8+XAM2mqu
-xAdJghPoyXJEs0hEwTfu5clQ/IMJh2McWXz51DP8rz2zFPS98Vg/8+hx8Duq/vZu
-wU/tqR4wQg==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAIMgnywHFbPzJ
+BEcbpx/aWQOI2tUFlo7MUoPSoACHzoI/HOUTx25eKHlpNK2jSljLufhUd//eCCXg
++OQt4f2N/tRw8gumbs3YDF7+t3ZNGt+iQxZTwN7MKsGIZy+6R523XHw8lpzFX5iz
+XgIS+0APlX+XyZk7MRCcBWh6PSaSqEOOvUXVp6Omh3it034kBWnm809TEWmwiVw3
+ssPDmpUCArdDNMMdvQehzaH96cdjcSsguqpX9NcMDUmmiG7HLQ2iy+WSzek9S46S
+bKKDLw8Ebevfkl6PEpg+GDulq+EPXayN3AsFXkF8MaFLgfeprkENjN1g4jM+WSyN
+6DC7vCkj7A==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3TCCAcWgAwIBAgIUa0X7/7DlTaedpgrIJg25iBPOkIMwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE1MDEwMTAwMDAwMFoYDzIwMjUw
 MTAxMDAwMDAwWjAcMRowGAYDVQQDDBFUZXN0IEludGVybWVkaWF0ZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1
 SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+
 zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYL
 K7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwc
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDDjCCAfagAwIBAgIUZxnYgfJoQ3z+ELVlXmGCOTLMzzowDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDDjCCAfagAwIBAgIUJ2y0EF6uZKyHB9H0gSvsoLhH4eIwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjA3MTUwMwYDVQQDDCxUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
 bHRpcGxlIFRMUyBGZWF0dXJlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
 bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
 Du0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhI
 H6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8
 rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
 Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMzMDEwDAYDVR0TBAUwAwEB/zALBgNV
 HQ8EBAMCAQYwFAYIKwYBBQUHARgECDAGAgEFAgEGMA0GCSqGSIb3DQEBCwUAA4IB
-AQAJjhcq7PmZYVDAt5M6U+gTb8m9xc/qIZ8JC/OvO9EKmYJjd+jd27nu/tczgEAd
-9oXawHlTpTJfI9ETnggilxWCqUpJNr4rmhNmAz2PmbccwrbOSilAJVON7Svu0RLn
-zxrCgBpyCN5tq16dPbc6TquJUHpIae5LwVGQPZlWesZbZ20GLmH1/yJvOQ1o3PnK
-6n4wH7bUkm0uCZiUK3IARgZm9DaVyF8aQTHe+vz5g5CGoN9jkbF+gvMWLxjcZvLb
-t4xkQ+jKdFTUmMjhRMzhLRcSfpgfnBzU9TuX9aCFfdOtLY2C5ZsXb+OSBOY4gh0+
-f7UYAti7bR7el/dHwzDsHL1r
+AQAYj2nRL+5J7TceDUywnVPpOAINR0IOQBm122NUIWSehQRMVRUHqGPRonQMBovF
+ZgYyU0U0tu1MvAN6bd+LCLAua3huaHhSMQzUDIx2oOhHOCCFJJT3eRGvYmNG4060
+wdda9wJ4pIZ0l4lYTHMYun6QyKXsWmEf2vRl2Cc2+LFTrDWJH01+/6YGV7cM0vc/
+CMyDwoq8v7rozULzGmJFvB/ilLYmnR6WsRQLClT4+IvrYtAJJZeagDtflIPn6ULs
+G2n4uKul7VSENjdVDpxc6+g79nPLf9bm9o9SzeXPJ4QTyyz9w/B4BxILoPBt/Tcd
+UgcEVGmubyEouKJTkiCWC4k5
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
+++ b/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
@@ -1,19 +1,20 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIDATCCAemgAwIBAgIUC9ttH3gWInhomkbs/Guf0jfBcYcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIIDATCCAemgAwIBAgIUY0KYLrbsHU6VnBRTOEkLHlFL2N0wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
 c3QtU3RhcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
 sdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbY
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABozAwLjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAR
-BggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcNAQELBQADggEBAHHrwWgn9INpRJ1H
-eEaD/vlQkg8lHsTogNW7yYME0SE/mcosDxZ8E3HXNPx9W18uDyiLmOB9RnkF2l3f
-L4+XOwiDKM/I8xlh+M9CnHCPOgTM1k84t0jdieAzalsJcS5W5cDDZm1PlRRGjUB5
-/jGwbJamac/ASA2OE/WxJIsLdH1SM/j/ybx0YhRzV/NP+zhhg6sq5kAeyFUongOV
-GBCbftBlK8O2gfYHk1D0S9k56ZiqdG8MriWZYJ4uSowvJAOMwudELJxh8qGAsHbG
-oi9LqzkICTP3LCnSZ5RyXsY6hRl3dHANTDp+TTBa+LdXCyVld7uB76vZCSorD8qY
-9q88NtA=
+BggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcNAQELBQADggEBAGlohF7XL1y/6mT7
+CZMbJO8v/UMzpkd0qOX9M2HKNtKVeYkf+UAKpvYBedsfbNAzxk+kA665gb8HKMLY
+a65ys2l8U8My/MKPIvZzR/V4mMn7QFREpnQz1nh+SMhOwmCLFnpcgMopZ8w0Azp1
+QjGP4MjF+PByKBaxHs+yi2T+iunqpyQiIBF6yiIWbv2X5Ozq6UH0byP3m3a3bm2N
+epjZJb+en7dK1ZozVQcYpE58YAMfGzfiUe7+q+Ph5D27z6KdfSTKDrQfC7Tg2ZAI
+8D3wIA2uldAvHnasZnY+5EezIUtGV/9kuJc6iHdmXsI90YXgOgmfxuX9ebRHXNUZ
+UgjD2S4=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUVWN4Z5pcAr2rigCRDVzZAp5v8/cwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNTExMjgwMDAwMDBaGA8yMDE4MDIwNTAw
+MIICyTCCAbGgAwIBAgIUQ7f25Fqhl2uttzpbSpf0KNynuVgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBA9W/mYX2cBJkJNNsQUc2iVTYm
-SgUR50gATgoU3XNFyIbsqj9+h18Iyq9sOJU4da9V0zBW/53xjgwE5Vq2M561a+fv
-RK85gC/QvfyzxNsltsNia0DoOMXBk7+4bfkbd4io/7AyhMU2HtL2kKhOD6GofXA5
-XoljzwebGvKkrE3EgvxeGbvUNrCs3QOFIwiUxzCvbjV/4WHYXFUnqJ8PPsreS9S7
-SbGJZVYWQDBZU2g/llST5KNUf+81wgsMIhfrGII1oX7SUi59ZiFNntKlryNBRCG8
-5x1979G+45xjxQ6uAG8BhvNG2IR7MSysT9sX2+BoIGHKbT89gqdpjJQRg1na
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBrGiDYu+Y+mWVY+itzQlrQC2V1
+btQ30srH1mHjNnHcxZsZgF1Wb9NP8MVw+Z94tsvOBYMK9CRtvdhoTsBxYWkkksYB
+MUKCeF01exMTEjuJMrQjU2oG60G2tZn94LjD3yN7EMmqj+JxFFMnu0oVY/sIKpV4
+KJO2sksV9igJLMh6wJcKkvjybceTjsHeJ2FEXmcNvRu7TtxU1j99ReKu6VWsb+l0
+oZK930au1ErIzFAZr4vQ8c7qQd+rlx6RX2Ulh7S3mjPGxzPkYFxWxW2KcosTF3U1
+nIAW0wneZLEdgMXkgZXUAz6eYY4cF0F18eaIhpt8kWGU87p3HBBRmnuGAQC3
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICszCCAZugAwIBAgIUS00fexo4Y4FagP1oiKQiGCJKd/swDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICszCCAZugAwIBAgIUZ3gdKZRvWFYArMRStT2zAGE6JDQwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNTA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICszCCAZugAwIBAgIUWxGwhSb8roUQoLNpJajl0X8jk10wDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA4MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC5TCCAc2gAwIBAgIUOWkKeR6blD0zzhElEnCm4eSqLTAwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC5TCCAc2gAwIBAgIUG1q3+RCKIizPHadkamCYLL7cp2swDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNTA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
+++ b/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC5TCCAc2gAwIBAgIUD1kNqQ0aKQ2TJjGUYztUh8I7j4AwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA4MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
+++ b/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUGa3JiY9+V+9Ipp67Y6Y8NCf8V3AwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIw
-MTkwMjA1MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
+MIICxjCCAa6gAwIBAgIUbzB/rM58wfRs/0iuQ/xfzkc552cwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
+MjAwMjA1MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBb4CvFzS/eSvtCLuq+YbwfxyQZSBlj
-H53fjCrF3lHILMWT0YxcE6qwtxBRJTGg/7qPCDwStJ/mSwytyHRhC1LZJF64kVzZ
-pCCDinnAKyNdZoPJQ7CpwL2+Gllaqe7pMeuyklh79w0oLjGfq1KQjg5jaZPxhez2
-Ff+MNNvf6Fzo/dqFyFQm1S+iWC9OQLuqLhUvnCyphleKklUATRQGTXYTKcg9JKV0
-jZIK1dT+VMpFgkKeJYj7dEW7gOmkjR/+0TXvsU/MY5AnkvEQTrZqCHaZVdplNiJX
-sZSV7fWuzsBh/o9Q1/LHPSHG6JDR+ndXOx9ANelkycw29NDpYnVcS7A1
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAA0xshP6sKTqR7yx83OV/xxLsGxyvx
+ngXTB5sTFIM2xTIRmJAYhsfdpGK3kICP5lnv5CyQYYJqT5jLuHQc14qg7XzJuwIj
+/LJtWZUhCj58ShZmwD81ZcXwaueNPZZnjlsT5dIM2zZeq+X1/VEYTtMDRij4LQZL
+1dvs41MFUcBzgGCGeYwst5kmlzoW/7WfWycWh7n0zru8Pe3w7g3CEOo46XQO92W3
+Qywx3meearX+KJiVamV1sB/Q90xZBlQoZqys3Pu9NSV6IHL80HMKejJmFk0tCCey
+Hu96t8+9or+896VorrPVyKsOGQB//CYa0MbUI33v4VdTWhRYBZHYqu80
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
+++ b/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICzDCCAbSgAwIBAgIUbZEO43nvHgEXnDwL6O8IRooSdXQwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIw
-MTkwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
+MIICzDCCAbSgAwIBAgIUJeivZ4nTHueZ5ue0AaQ6VvCjJH4wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
+MjAwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCz+RLcTO/L/bUt9/xiqVsI
-mqQD9OdSSq4AHckcN0mxmsgsBBL7jLfV9ZGfby5fprNdTGdixq11TccqxzzUYF0q
-dnN0xZPagGuPJpdXcIU9huIuy3KDZ0GBnuZGEGg4KqCl0pib+MhVb7InLopeBNc4
-mIfJ40XPSNW8b2EuK9Y6WDQoBbdh3ugpWuZoIVIAYz6RQW1YnYgI+nO+vQS9lSsc
-y7FoeOUkcoUwnUO5JDPwT+cqFlO2df6G7CxlVS/s9sHLUoWgRV+fBYkc8O/M4qth
-5EBe5NEnmAvJadzXxyQNQVgFp6HiQaT04A5s06tDQStLER8qqqI3leqnXLiOQgYI
+BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCHx0n9Qpu4JyQculxyyjHG
+qIecN8Yi2nPLP0i/cJia9F77XMIEDgpEXiIZh8ix7fYUt//6FVYHDjKKx7Vd5m07
+OzoXTw937cQFFwWFYuq8/Sh0ZAHe+UoJuv3GHqBADM/P/NcC/tNImuoO5RbxNQe2
+yySru42x5pXsmZIJ6SAna8HqDok4zBLwikO2NvU39dAzwjscGWJzzncHcuUaxop8
+DJPc2c4XmVQhVUcKbLZnWUYlDFS/OseHSAu2TpMCoL0ussTekkMoaEbnmTD1vZtx
+Ab/3xO9qgM30bREuHG1/PndAVYl9lQGIbNxLial9kQtkkjDuCOT9FPmnoBPDRZFc
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ca.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICvDCCAaSgAwIBAgIUbYeck7JVOWdVm1AGwsw/DzdRnaYwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNTAxMDEwMDAwMDBaGA8yMDM1MDEwMTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUZ/d6g8wfe/3QJFdUBSKgAAovv2YwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAgIUCTj6rhgP+cSoediICHok13hw28IwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEDEOMAwGA1UEAwwFZWUtQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
 TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsG
-AQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCx/ZeW1zPq70RRxqufhHBTa/pMoxZ5
-kWF3HkbcdslYl2Pvxvhkpu6u3VAja1fSEMuNu/M5cV3edGj22kQxFw9W82X+V31S
-jEk3vaC4cLt1QEW9x5Aiz3xCgi7Ly45jco2PA4EFmKeB4yYnhre4Gsty/ovMuekp
-/v8O9gzS7m8M9ayVN2R002MkWdt/csewxU9Py3XtYZrCFVTKv5FBsXqa+bJaB5wN
-eBrr3umiO597LTgfPIS22rgm6KgWQvNTh4te1Som3yHY3gByfFtk9JewoHBeExxB
-BKfSN97PjzQaJ0axDVheEHIIyCveBeUR+2X+QQYKzD9301q11ndzfwzM
+AQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBusOOAuMt3Hz2C02B/PUthTU1+Wc8k
+xzTCsyTj0buyOZ/OkjH2yc10Qjh0a6vjug3n6zp/ocP22i1oDKhC5NK4EPCR7O36
+0D50M27/lrgWWUZ0HgnDDVrbePAm9g6YOiJx/3L1bEJaos7wa2I4fVsQNm6Flwi0
+1Ga0yZhaL9sRIYjfPlYtpOVLl+kITRSMcUJF2ihsVxITRbHMMLUR3NbYLatsFK3H
+sq5ms1f/Ozi+9UCS+kOhJHy4WdEZqUTfmBiqad0294TqLp6Slq4HsZzRtGhiYIxw
+KLR/mnrFjkzUIMh4EuCPAmZPib5eirf0IOuuvetvuIbPUSr0g0fqprsK
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUN4TVPsuYjINxYEk6YKedorzkmkgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0zCCAbugAwIBAgIUCyMxneVbdFsB95ieVZmsvIVIpeEwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZWUtU0EtQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
 5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQ
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjITAfMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAsBjMfo5EFZdI
-PZT6GsVlDxf1mZ65g411na+Jwms75uFeD5w0kr4WgTdQ2x7xUeZTmwj22WWakFTZ
-7qhRvTyvhOHiIalwzlbLRP6EIqMAnuOBDSTgBBN79dMFeWMtt4FGY5Gh/ArskkAg
-Ksp5+tGLnENLAIiHZShKn3uE/craarWAJevGzyhRft+x17aNZrfRLdVb2fR8lKBy
-OvC45veKylJxq4/0N726Znp3LKCiERinDRM6ZjTJvcfcdhuqNCtdibv5mWMJyyij
-ahV2XaBaR4zymARVLx1z+q29zmYuIf2PGWAEp2n35bhkHnwvYlMA2UBaJ2zhxaOZ
-ro8qjvx2kw==
+CCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAoTGIGYDtOWjd
+bJcCElcYgHg0QA0H9rdtSJ5V/70ikh7eQSkUP7SmdIkzd252srv31VuS9RskmJtC
+4UqgpUkd8cYp0pyMtUS1hmQJLv1Q5CtDcju5/NZjCgQf/ckryhmHUEVVbT/75JXh
+3XTHyPfqm70Bp8mex5u5Aw8g0hkWvmvzEnKHybhfiQH8HsWHr1yF7IxxIQY+j2FM
+SLlKgKrnshx8ITIWoAsjSxjXBYtPA6U31pfCxveB/JS4j40yI08N9KQ8VjjM9QZG
+5+if8VJWwj50x6AaV2WOXC9irYuCSYYWTskn4E7HJCl9S9jWwAGs0wgXmIon0W8P
+ptc31utUIA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUK9I/xH36zjjkg1eA1+sMM7O6KAkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1TCCAb2gAwIBAgIUL2rEBtsfqVAouRfMW/2qxN7tlSAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtU0EtT0NTUDCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMhMB8wHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQB6ySiD37z4
-CkFOEkuovobtsxcrLYBn3igLfj/ADygg2eT4yIKMvThpRa8QceMMuG5W6c5w5QiN
-EVXihe2SPupuo7VoKK+3z29hOH17qh8CDXUeAHlvCFdf8chzNBAcNAtsKubU0/1u
-LOTSLCE+Fj2uK38mVvMJMvmzyAMnHTvMfiKadu837nxQnYgcVwGULqGvbiH8Sgd5
-5vHLZj1z6vc25Z5grnWUutPOPsplVKIXjT3KmLUy1Iw/mtazHHKSxYS3Js5clKK7
-nmvnvOpsOMauA/Y4bznWN9fcYv9qyGB52IJJcELi/RlyqtLdsU9COK0+lbpDGJf/
-ZQnl693HSY8U
+FAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQBvMr001lhb
+MPWu7R/StTkqUEZH0UZ/LcPek9Jvq1rzcVKXHnatW67AKhcV7eIQNGKRUlCZXdtN
+gS0gFVy/fxYHMnuR5vQGPItTVdDiyXqhSjxVev0trY15cnKAlcZnh1jy07VLli2c
+1G4/nvtnRjR5KstFlJZWUSHgxzZU5ccdu3eQ0/uv0MQpQLkvxx/+GlHrubWIk10u
+Ux05JAhZ2xRSjvtok3cFqwyMkH/gh5ZYLqZ/rCxmySGAMO9qOYXgat+msogIomlx
+fl4w225919pgf0EgMWdVaktfVHtpMKtGiwPk5cGgVdYw1PfpuAALZNllS4yXN9CK
+ZJhQ0oBhP553
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1zCCAb+gAwIBAgIUT9vT+rMXKhprpKT36jVSW4FrGskwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1zCCAb+gAwIBAgIUfQ50hBabT8Gii4RX6UR7AXxcqNowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtU0EtbnNTR0MwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjIjAgMB4GA1UdJQQX
-MBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcNAQELBQADggEBAGzhZyVl
-SfFjxwtN8C9JMKSabd9yxukpPubAJGl0t3lMXdRtUNW/WnZZw/mDbe42f+xT2Jid
-iWzhPK4qOjbSf7OMEsMRaoXfnpO3VPxtHy/EJ21aaiw5vMpSW/xEj2IaQ+/HfBoF
-yZINc9vJNgMK6dB5BkGpArQu698dzkc0Zg+s4OwqK270RZFJIHtpu6NOQAwJ71qZ
-gcebqlTtuVlxKkBy0lwgwlygbHFHK07eLHHnLobuiJs/M9bv+VA440utkIdmOQyD
-lUaQ2OYWefajy8Glxzn8lHo85BTp0AVTsIutriE7TiGFYifzcnrf8ubkDUg3PQ4p
-mK44dGJlfD9pluU=
+MBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcNAQELBQADggEBACKXLrFJ
+qjSlBBunf70PkJWN4EqmnVO21rPHujlsD7LEXAtWe1l0A/ULDP8J3XN0kwEHRn7s
+Jian7zH+UY7BoqoNTttPIzECsEtw8LUPl7G8+q/+TDVZs4rPhm6fqU2wT0tzJqp5
+1FSmbr0lG5zoXFrnT7DMcpTmkNuHVvaZhIZe89UXujqrcywHnllpAH5Gxr8cAozK
+i1o64HSESuwkBRMY9KCDm4vY9Fq0QsIAMT0NQ/Mb4+iEf5TTeVeyt5lzf2sVEPou
+VdzhVPBAyOULbibim+Eb2UB5D90HBBi2C3Ett835B3LwE/Jx3/fk5/fEZtYF8tBU
+Fli/CEZtzmKeKfg=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUJ8y+pe5QASMyYaRYrHZ9Mkb6btUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAgIUZYrJ+wehwgH/CPEjIo7WV67dxlowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEDEOMAwGA1UEAwwFZWUtU0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
 TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCMWyWyfcunadES7Q3GdyYcel1MKdGL
-vLILIERDwRopqLU2j2OxoP3ozC7mZoIUzWHzHOgXWlCHi8nQIbevjbpeglhOJ4Wx
-SNyhsKHceRuDP2N7hkQJy////oFka9toi7Vj7k9frvCbFyQgIGHMnzCR/cgRoTAx
-w30SN2GxrrTz5ow5faVIUbrFogZeiuh8heERc8qdw8nvzkWxmRWW0KyGfJJGAbTN
-oJcaepLIsdzXCVOJhER/+BX86JyQQD1tvehStla3Ib/DtVsKF1B296orYqe0ZYEO
-9he8h2+ZP1CLOJJB9DyDB5ZpKULjCu2NzCEdDolc5gS1oOtHh6kWcrq0
+AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAOTFLcmp0DQzgTSKIssVktXl0cxi2D
++d5BjO7OfqsgNCghkN6ftUYATh91700QvErk0D90v7s9hicuds6JysfLQ1SNN8Lz
+SgGD5mI7M4GNrEF5oYN7FkwfLAG9YczXgSEith0CghjMhWiN020KFGDSiobcMaUd
+OIrSZ1keSAcjRNasruW0dmE5tgACtuEnEEwH0+dvTSwDtySFSwHCj3f18XwUSKt/
+sLAfOgwauGWgWyss4pPX7B0BgO73LC9r6072sJ8Rt0nJLLsdeDX7YnanwAC155vc
+OAKvunzAELErYDfUn2eT0dQSo8Ii//unfZEOYX6yh+eP7PuIEQjWJX/A
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ2gAwIBAgIUW+6aQ6W4u2ysZR9105lSuLd4J54wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIICtTCCAZ2gAwIBAgIUWRoAc8p4DVFQcoFFBMSTkVumflQwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1DQTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAdnx5CyhUhCPheMiWp7Nr7VfBFGdVPI9H6F4Y0yGjkq9HmXur+fgb
-M4kmQu1E4NuOQfMPT8mwDX4sS42EqR43hMDeAcO+I5myQksk96e+vhBvig/R8hGX
-OJ3Cfrcx1t6NySKZlW6qytI0ohWvjsPfARPBTyWCe+O5Mpv/Me7ZnzVL8Wjm+Thl
-8hHAsmQec1kjgJEdfbmGitzacLoed1fzOQ0vi8YSkvKOj23QbriT8jYbL6itu/xd
-tX46ZDxSTR+1INUL+8qWKm2Nd/VmtyUwQotYobdvFjq0AzZNJIg3FdUYzzo+J9rG
-yP/jF6cFZ0xEH+mYZX9DeMr+aR65l/vgaA==
+AQsFAAOCAQEAlYFHfHf422mC84vTjr8HXj7oUWDzC7AX9deqtxK/U4YyVGQGfSC4
+EAJ0iAms/CUZoafuQlwEwPKFm9W1uIDuOg7Zoj6E1l7c9JHZq1GcGqHTv4HjMKKs
+BSGFN3g7xbLbJAcH1ezvN00n2CEDHFJxbPmEr46/Y3NbhD1qHDCs+y9Xdj43LAOC
+pRzN9/7s5I6MCtlUC4j68mUSiU/Dol4P7iIaW8xdliwJgKX3VQ3QIFT2V1SolwdU
+E1cFbOkOktcF14RKu3sgd4KPf/ScAI1QVBNC/ZjaBAhMCoHk3ympWEfXlI14nHbD
+AH943mOLcTDZiqO6B1zGtU3GVDHzVcstRA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuzCCAaOgAwIBAgIUW+szLtRLe9y1SOmibApkLkmuLiAwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaW50LVNBLUNBMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAx
-OTAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLWludC1TQS1DQTCCASIwDQYJKoZI
+MIICuzCCAaOgAwIBAgIUAdXAdRgnB7t3bn6+LJ/kcUBEz5YwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJaW50LVNBLUNBMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAy
+MDAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLWludC1TQS1DQTCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
 HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkq
-hkiG9w0BAQsFAAOCAQEAn6q+s4sxZubGRhIQoDn+caIiWB7ZR6ipSl4qaUyLyKFl
-vwlpCnBpibkTZBmcXgQIUN5g9DnVqXg2xRZXTYwRIIma5IO0Ajf2P49mJW8DkGsF
-80FgyNQVSJNDXtwEthGDoBUmeku3zSqI7dTBVFQbPCbE4GOfuCm4N8dD8E1S/b3G
-At8Sr5DuZ0lmpUtdka0VSx5oNBv0htcTFrGLKI2bDL5oGuLMrwNydSuOsf6/ad3P
-6Mr+Gp5K7gLYQEmCeDhaHVurHLwUim+z8zK4HbXgK+VKHcxTgIuMORm9T5OH0STk
-SyYR8LovzT0KJTU6Pn3HHMhpgQp/XVvFwyZlQzaR/w==
+hkiG9w0BAQsFAAOCAQEAh9mzjSFJpxv3RdI4WxPLFUXbjMb3mpdRSxra+EV7vC75
+XksKH16KMnMva9Tb6f1ZtKXFK2EbeYEgmL4Ox/K1KVAg8+vtAFBSF1H5zVxD1TCt
+3mSxBdUkXZcV8aruHv2U7xWplV+RA5OjuTpsBf8RLTu7mYL5LOse/Bhhh9VAnBwO
+HHwvfmt/Lw36JiQkKUmibY1lJB1KIKe004pwEy8eYks4cp/7XUcaHRCiYDVwG8XV
+o4JHFMNAJzciQFmSrtmFB4OWch6XTf9zpjy2ZWp4YiRpA0968AyjoqOQb6JyyGqD
+7CLOKO7cb4/eNcy9TzPdZy9VyQSs5xziZUHgd1FrmQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICvzCCAaegAwIBAgIUaesfmz0BXTALaNdacqfqUslibJUwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowGTEXMBUGA1UEAwwOZWUtaW50LVNBLU9DU1AwggEiMA0G
+MIICvzCCAaegAwIBAgIUC59ynrJi+QuJx3+4N1/1iaDQ9rwwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowGTEXMBUGA1UEAwwOZWUtaW50LVNBLU9DU1AwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
 fs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1m
 CyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTM
 HGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m
 1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEw
-DQYJKoZIhvcNAQELBQADggEBADkP3jy9Ihzr4O0QRZSWx0nnaRTqQ9nNuJ6RlZp6
-O3fccpMt6eVZk8f3CKjLDXUNzo9oMyl8+Lu1JH3+Nxvc6oyHcoC1NJ6QYjiL9nql
-0oVnWiy6QY9ap3xwf1RCnL02FQtJuUOLLIb5+zAaVXZXNUOOPVd0B1eLtW3QuBda
-sZWunq1uCvf2Nt16YXO/sdKuUhoB7MhNVMcwn2dP1V+z91PYinGy04gXDuAh5hLg
-IW3MSi6Z928Lqfbx9S7IR/Ar7GnispFMWgOtztWALKYueYhpjLxG5+YJKsyYUsa/
-3Xr1dOt5QusPVQ9eoxvd+Eg71bwPZnXgBMdBjwr95/Kr1uk=
+DQYJKoZIhvcNAQELBQADggEBAG7BJ8D8z4p/md5AFq5HKk9xVj+WCOr9AggEyhqG
+tdMOFytXnfFh5N2PmL0F28hgB/qvDdKRTRKLifXvaeGecsXqJt3lZ9O4o1txbc4Z
+6T7SETWUXxR7fuE0PNG23w/VOEs7mbsk2MW2enlPxpSkrdKBU5Ot3ssj65zxZqjv
+Ilmfbccq8T8F1nK6fE8Qr8UiBsUjmOxd3XX6fuxOcn+x6QchB4aW29+mUbOdGokv
+gGc8KkOuE+4jyPNdlRsx7YWcS6Un0nemzGZWKaWVQjXiV55CzRLIGCS1ILVK7sCG
+Q1Ilduxiph5++UEgT1HNyMGdwJQzte+QYwer/wWt0gAVJlA=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwTCCAamgAwIBAgIUTzVyV1sRqA6FhUyWCMTOtOJt91AwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1TQS1uc1NHQzCCASIw
+MIICwTCCAamgAwIBAgIUUXofFIHAy5pdJcuDxkxA4d/KIf4wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1TQS1uc1NHQzCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
 /WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAG
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
-ATANBgkqhkiG9w0BAQsFAAOCAQEAhM6ZVfUGaqSSLZVAE47dxTqPHV/S3ak/sFUR
-8+/VJxCESUR2PIlaya0m2usafRt+lh2f5yYnCd5IUyL6zh1tifFl4feo/3OZwWn2
-bAUWuHkGC0RDSYd4hPRChAjazwUMhlhuhdLTEhj4kT1iyfuTzX8RL1pbWCT4iRr5
-7qPTO3+2hEqtaRu5D135SS5TQA622fyr2Za1RLodF8qXwATufJ+YM97yZjsWqHdw
-lfn12BUOmhWW7eNt3z77xFEgDYx2UD6c+39l4mf7bjGbhj6aPizj7cDBU7X+hM63
-sn5Zr8SCu92i3IXv63fOVzuMfVh1VoRgUfNwqjVmwwkldHi8yw==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAkZv+muxGL19c2nlJUuSy01DsqwDepEcLdOY5
+4bTkX3Rgj5FQcbLmWHr92uKVYAErr/LPHm+BQ9gyOmbGLYVHZ9zt1K6QjW/5gd8S
+WflRCCtAinhupd7kqwdnhvWOZ+w1XG8ZBISi02sUXbTZ+/JoWo+roLewQ0H6zQdU
+bNMJTNcJIveYJn8SJC/0BmcBkZSAt6kgXE+lbUasmotPp0/MIolgCWBeEwp8bJdo
+C7bDesHfc4aHl8mdMDw79jAsd7yaoWyLXDvaA8JS1YWn1K34yWgso4AKbF48HXor
+WYWrTs4HHOOBEWX0a38J5TVMYuLSPoazbdiTbKuKea4Q9tJoyA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ2gAwIBAgIUYcRdyUvzcub+WZDTtIhMboVK8p4wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LVNBMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIICtTCCAZ2gAwIBAgIUfaFurHNc9FQrXUwQKDBjwz9NtX8wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LVNBMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1TQTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEALAxa2/MHYhaKCTnHvhEN3x6jlPYlkJtddslMbt0zXAHGoeUnkgWF
-8gCEBqzrn3F9LePPfT74sd/aDng9E1KkY2RKPQhu+qpFsJQnt4IX7LcT7hJlDi0H
-U0vK+LqMy+beILYqlvGrKgN7qq0o/fX2XKJNgHT6vFiQl49tJTjoUqnTHVbhfOZ8
-NpYXzI62HcceFiFMMVcrruGO4ymk7JDtlm3SmhFxFFCztDE9fqLAaV0sHWQEK/fu
-QhQWXZ6jPvWF2Sw0HgVDairvHyWMAWNJMf26jknZWeakAO8svigIvZ3933r/iPd0
-gnzM7TF47xS1419GfCcQADPRGr0CCM6Zkg==
+AQsFAAOCAQEAoXSlwVSL/8h45SnNslTG3YSdvHTzTZnGpfD+uAocXpuFkJijVXlk
+smuLrLoN5CQTCGqXaewtTUOFvnBZrc/pKG5SJITzOGhqTKIbaGwkGueQv1Gmt285
+4KQKda4aTfs9so4Bki0cbWyR4shp6X3at/RJzIt6t/1FVuIWgPgik5M8JEBGjrsg
+miZtaeVN0VypvETZCctddbQQWMPCmkyxXngy2jW6YHukUpgbSYG036PB9dOltjc/
+tE/ske6tjqXOWYvC2QGlmdDgiLDVnJo541Pbzk5Ctw+5zVYW87lDBbORJ7uxs2Il
+duvmrRemcZVaQ1m4i69jH/IAGAVnH6eJ1w==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICwzCCAaugAwIBAgIUB/nCi+kTmIkobMVqQFtJnevhGwEwDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNaW50LW5zU0dDLW9sZDAiGA8yMDE2MDcyNDAwMDAwMFoY
 DzIwMTYwOTI0MDAwMDAwWjAbMRkwFwYDVQQDDBBlZS1pbnQtbnNTR0Mtb2xkMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
 DY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQ
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICxzCCAa+gAwIBAgIUYfx/2lyIWKMRlK/zS6/kmkp+t/MwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaW50LW5zU0dDLW9sZGVyMCIYDzIwMTUwNzI0MDAwMDAw
 WhgPMjAxNjA5MjQwMDAwMDBaMB0xGzAZBgNVBAMMEmVlLWludC1uc1NHQy1vbGRl
 cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
 RYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHu
 p3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQ
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICyTCCAbGgAwIBAgIUE/PT07mikR8SeEYcqdLT8IL5vMIwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaW50LW5zU0dDLXJlY2VudDAiGA8yMDE2MDgyNDAwMDAw
 MFoYDzIwMTcwODI0MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1pbnQtbnNTR0MtcmVj
 ZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62
 iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHql
 WqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosq
 Qe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIULZrY3ucS8ydSH+zzKG6IqOS47GswDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyjCCAbKgAwIBAgIUJ2FUrb7nAfaCASz8mAyGFP0N6DMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZWUtbnNTR0MwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
 5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQ
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGDAWMBQGA1UdJQQNMAsG
-CWCGSAGG+EIEATANBgkqhkiG9w0BAQsFAAOCAQEAgdj0Vl+/BZCoTGY1qNu5l8DD
-66YmEH+qu0PRGv9sEAETBk1vIUYpSix9xEjtptlRvZxRU4skY8QH97ud9O6qK1ys
-Lu4TKq/YSjW05fLTURlNV8PjAOYv/YRhMnehghfj4R7Mr3FHBMl++vI7q2FrwGNY
-MXUk7S5OF5rNuYEkLv+C7zhW0kSgxvUUpfrcMvzC4Dat7Gx7CNm8aNA2GJFrBRWV
-wIIcVdqrOxqsPXrl+jRpzkMMkxW3eXJrKpi8WIq1G/GYq3gbptahX5BWtmDr9yJK
-Ei6ALHRbRT6mP0TfS+w0oE2n5u1qoxLiKRqb12LGwm+sSrSQ8rKBPFSuWC9HMw==
+CWCGSAGG+EIEATANBgkqhkiG9w0BAQsFAAOCAQEAQKfvL+CVQSYvc4ZPUJgE8zsB
+0F7/UetVd3OsHHlVJM4S8fAbM6G8/swUlBEBZv+JYn2aJbk3JrNhtU/MkjF8nW1Q
+nIY7lzTATQbE1WS0dApfVDicfTuYX/YCcS7t9Oem6RHShpjCJBNt3cC5CJTREvbe
+Kj9uO7VRCXJW4CNxXnTcRKDExGvIdrKc/AMjmZQRgR1aD5tCaL6Fo+azpPNFVpJp
+DMijodP19shEaNACgeIzEUyJh9QqWPrW1HVUddeYSANlhXYA+LVrBnt3bWJTD1yj
+Elwdjk0BguJGX0kJcysTxtGJVdfBKpj7NybJb5CqmQKfYDhSyAF3YAt++cK19Q==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUAyNGnUCN60W6KEJCLOCnpFbD3i4wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1TCCAb2gAwIBAgIUD0ZFCPN0y+ykBjonSfEX8il5Ds4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGaW50LUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyUwIzAMBgNVHRMEBTADAQH/
-MBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCfnkD4HNu+
-C/EHAAQ1EmhPGzqh28ncFKXGRQXohmQoDaICkbDxTTNf6BwrCZE+kHaXU7VTOBZt
-NCDs4KDWUKvSoCT3G8UBuwwP5WOPogPjxJEwDl8M7OiH54QCWDY53lewdC1Jmgaa
-WLOZJ4GIPt8KFTXsW0AfyKWpJF273bIkpwS7cUiPRasBQHVES2sPQE3KscLPwdx+
-bnBJSjLuWv190rLwjK9gXsa0V2gR9zYaX3f3DaBxEb8W9ymGEwkF//ic/q1bA2Xr
-1DW/QeSADvk20WbngsanGGEbxwLutzaNEfclqjUSXIoWU+5MjPmac6hTMhiMa/2J
-cXhYXaPKNIXi
+MBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAOoQZAEDKt
+90hb/TqUUeJG4DD9MNYqgPXrkQTlprUeI4yIMWap9aPddwdEw07/tgMvsFIca2oq
+BE0FihVoTi+dhiwaZfUaYBVqtj/uuwEvfOEpLEuSLuhSHpLsBKIQeLP+03x49u32
+lqKYcaZ5DqRV6nUBsmVfj+hoVggRskVUigeaQko4s+57owB6RceQK9qWn8+ZrFa9
+3Jv2pu+toe/dp5+AekNaFUfCI5+VqNVE37oex/I0ILBFwtjwJqkuSPGkzv/Csvr7
+Vp93tz/p65D+zRNh5sozjI+F/eq43tG8571XUHaZ7u9If4RkCzjsfZORXCnG24+U
+rIjYbgZrtgdE
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUL9Lyz/+CtmMFcRD6hQk2lXPn3ygwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC4jCCAcqgAwIBAgIUJT0MgrHFdV43ce+dgwKaMWcUMI4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFDESMBAGA1UEAwwJaW50LVNBLUNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo
 4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDD
 SeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFX
 kD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUx
 owyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/
 Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoy8wLTAMBgNVHRMEBTAD
 AQH/MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsF
-AAOCAQEAm3fUjriTMNQ9PrzYI5zyNJ7mlouO/hAtcXjx3EOjZ0/rD01irKVyxbb2
-q0mS93+HzkNSN0qpJo+vyLhkElikLXWl+ZsSDzL15Bvbw/tRct/ATXgogvn35S1j
-3a0fVQg5YHSIyhH7QUyJCXTCQDXCm5m85pkYxWxPQRGnYGOgCsaM6JiAyF+nvxkX
-48qkFKPPHU6Eg61f8qYh+wpcqbK1NCtIwfW1UEP1tRV5YtBRIt4ixMSCWud4AiVo
-oSlb5flCXbz4Woe+W5qEIp3WkWdMS2OnzX/YDZnHttTyJP2X7c9gcj4QlfaJp7Xw
-esSxxLafxr+KY69sTiY754pabos2zQ==
+AAOCAQEAsU4igifjeYkyi6prenpBdn7+cGJ44e6HPdnTYh8QnMTfTGP59YUM/Yj5
+hsW1lVVJZlzCbf9ezyvAFzruBByhe9tq7VU7tc3pZD/Lm5ImdDknUgLZP5ptVY1A
+gd67oMlliKWQDvTEO3QbpszhVvtoksxvdon8+fSQclBCEFaTJdqA+hyUNE4nLycK
+aZ6dCHDJNvKeb5iKpb0msDl5joqs4HfKfgew0MbCqMc8Emr4TTOirN2qnRv+Cd99
+Aux1S3LudrSzMSto7GNuIwGi9/misHC8j8Te6MlL64bNswfC9id2IybD0bW2ncSn
+C5bBtP2bptVLQ+A/OUBPFuL6Liz16g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC5DCCAcygAwIBAgIUbUWgWWbEP3q5wwEHvmaCVNua1XgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC5DCCAcygAwIBAgIUJTHqtl2jdQvC9T3AQvXuLAmKrpowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjLzAtMAwGA1UdEwQF
 MAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEB
-CwUAA4IBAQCwo/OQY+Byq50gAlpcpFOj+lXciWSOWg2VH34xSZyrBBQZ0qbPoh1G
-WKygMW6W7Ad4k/kwfaBCLhMu3j7Zgtz6FLWLkIkc06K9aFVXrscJ2aUlP5QcEFhL
-CMKBguUlGTArhzu2llrT51T02eSxHQJZ1FjN679GcP0a/OKI64uhlkcsUeTpym98
-kq/MX4XsZUEEakhKb1Ate1HIajHQLvEuW085gfoEcwurCBPmrmi+eG0fL6JVXapA
-MnJjiCEgD3zCdgbToU0/E+9oyoVVCIkQqJlAsjmkBI/Ui0EA0IbW5L4kXgiwnBfX
-LCEl/jXxybzX5j6dhXwlSTFBV8syL1OF
+CwUAA4IBAQA1w9M2Xg5YoIv866aCY6QXWHzmLKHhhqjuY+8WBgOV8wMVudxTHHGp
+y4Uoqk3fmIaU2JiBjUr7qi2XHWFJQ/4bhf+Au59f5y8IovefXlA7VQyNyjhtydUn
+LZJb03wxLke2g1itbasO5IW3xMSTJGhQ6fdkvAkgSDzHf/PXO4c9vhsUtQDeYhRh
+OOUS4obSSeGa7YBQIX+KNzAQ9pQRYhaR5ROr+Xd2Td0I1yw8yXUBNs2hKaEMvdir
+QqnpSrFccdrxuAtfyY2H+lAPvnWyZyFckrzlZkxR8CsjwIL+hq3A8W5aEQvjhe2b
+4oXWnkDwde0NU+gL+AaJWqrof8hbPdHq
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUfTQIpdgzaLBQtociaipqrRDY3uQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC5jCCAc6gAwIBAgIUZWPrp5CDd39yhj+ihTCnUTHSlncwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozAwLjAMBgNVHRME
 BTADAQH/MB4GA1UdJQQXMBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcN
-AQELBQADggEBAIazEgGTL4etWQKQpRJhnwm4rgtXtSTJLTJvP85Bl2nCjySx8T8C
-+5sFgLN+RM5Md3w1SVYFM83hEpcblroJTv/vgNn77hq+q7PsAY7m77QiR2MDP+43
-c9oewOwwHsu4N+Ymb1/msqM6wqXFuq7lpvNW+RyRUt0l59q26tJx5XRIViQfh3ks
-BIetqjTE+5wwSpHnWoqZ38egkq/Vk+lA9XICUSv/EbvroLkzx/dXRVnwmT/HSzwE
-cjdXrWNRdSNrrYDElWGiXAlkDWnk4hn86n1kO12E/Hsdbm4dSPUuLU4JWiuVa3yC
-vFActjQ0PeXuC5SEKgqIGMEdTEYtcOHnGC4=
+AQELBQADggEBAJlG6jccEmRjVNZKo0XCJV/9ZFwU2vhq9Msd2Yqggza4XasYMUSx
+SEpYyEqoCw4soZSLvqTeLC1bM0+ILlIhDsbEoF5xwCzx4tiy7lwcISndpHHiSwpp
+JaPZGbd1iM1HIWhyQTWeM4NeNVT27u0Fjto5cG6LsNbqK6G875RoxXdBdToM0Wek
+MqswWkdyhAOlhY95DSM++11AgvfjPrGq7Dd7rblHvxW6hB7kNrCioTxsH0uU+0qO
+HCoVV7HYHPdI7aBU8OFBTR/e/7DVx0OoxWba6pYgsu8CDgBE+boML1TfAt2Ba1Dw
+8mdKUkTacLkRJWxcbDRld8KfjJ/yEaOLJ5o=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUEVEo17Hr6qdYXHMRHus4cxyBcTEwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1TCCAb2gAwIBAgIUWzUb07f+QrYK0VIU3sWnhPiiHDAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGaW50LVNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyUwIzAMBgNVHRMEBTADAQH/
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBGIcZ6v0fV
-7YCRRahQ0dD7q7e8Mi9mB9J6Ohdvp7wmcYoozintYYw8VGVSA13nkLPrZOd4yIPH
-rXBxEa7E1O7VgnTEngpqr9wnR1nnHuEbiRgoRpOj33ii6FidbzRc1AL+TrBFMaDc
-fw4YfLf1Xo5ktisyk6Y911/15pIOqcGLbPHo61UDNvB06cUwOO1HxC9dd3EZLiFp
-bs8Vj84nDX5lQviEkgJ+z5Bgo8vDf9yx+etIgAT19OUtOW4kis/brxqLaa/C3Xbl
-rlChJpqIS2d0qaRZLHMTtj7oMaxX14ZFERuHhIuIR/70xrnylcNfWVKNJagKaVcy
-lQr4w/Hojvsm
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCM6ZtoM+UK
+y0K1gRRB6L1aaN8B269YQo22E6NuBi5WWFSCAhdOeJnRAgKJst6NUa7AB0kqi4zk
+TX8z3s6lJ/jOv89XU7WaXZY/d2SGym2qZ1YOlshloFv8z2CRQyL2y+m+yrk09597
+TYqxPCDllrZxkIn4aKKIJmT2+jCW4prICswCGvX3K7y9TdKm+gFWy9x8BN68PzrY
+YTLPljfwK3ynKNnXYq3Td/6122NpZUD86gPOYpeEk2X7c8W80Fm6Ktx9fbSUvdrt
+YbtO68c/45+mGmthNVkKSMGsSGkxgIWpuBmkXe+cRdX58CNzDtZl3EcpyEp2Jety
+/5Y6hI+oA89t
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3TCCAcWgAwIBAgIUbXK8dZ2kTHVUtKZ1Uamdr5h27tQwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowGDEWMBQGA1UEAwwNaW50LW5zU0dDLW9sZDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAcegAwIBAgIUITNR+z5zrXNAq+3y9u3et1fNp6YwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNTA3MjQwMDAwMDBaGA8yMDE2MDkyNDAw
 MDAwMFowGjEYMBYGA1UEAwwPaW50LW5zU0dDLW9sZGVyMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
+++ b/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIIC4DCCAcigAwIBAgIUec5AldPAXDY+y1Q7RfO4SfvteiEwDQYJKoZIhvcNAQEL
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjA4MjQwMDAwMDBaGA8yMDE3MDgyNDAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LW5zU0dDLXJlY2VudDCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIURxOdvmKY1LMeejuRTiuHeGBhZHwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyTCCAbGgAwIBAgIUQ7f25Fqhl2uttzpbSpf0KNynuVgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBXd3Rnz2WW+aczo/SPlYSst4Bp
-hWx6S3ncLB4RznGMCTndfJCkpOdkDvDi9swIN4xO19XlUJFX5FiJ9vbjrxgz1hV9
-/FsqApPRAMuA6cWMOFWtIu/qgurcCMpgcPyO6MKGR1YH1C2fpVIDIDc/ID7sIpLt
-m208pK6P9J61ka0QqjQkQZ1aDulBj+6Ic5GYwyJXAWyE3OoUJPteGM12yfT/7lOC
-ObxJaqJrOYQEmI2ZZQ67MjDgfvivopIFQKOJvlBJKHujDSz3ZFykwx7CwnvN74sJ
-07snm4Vz6lAKESVa4H65oExOqL1kEMQQKyNmOKEAMOmHM+L4toh17ax4q2xP
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBrGiDYu+Y+mWVY+itzQlrQC2V1
+btQ30srH1mHjNnHcxZsZgF1Wb9NP8MVw+Z94tsvOBYMK9CRtvdhoTsBxYWkkksYB
+MUKCeF01exMTEjuJMrQjU2oG60G2tZn94LjD3yN7EMmqj+JxFFMnu0oVY/sIKpV4
+KJO2sksV9igJLMh6wJcKkvjybceTjsHeJ2FEXmcNvRu7TtxU1j99ReKu6VWsb+l0
+oZK930au1ErIzFAZr4vQ8c7qQd+rlx6RX2Ulh7S3mjPGxzPkYFxWxW2KcosTF3U1
+nIAW0wneZLEdgMXkgZXUAz6eYY4cF0F18eaIhpt8kWGU87p3HBBRmnuGAQC3
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
+++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAgIUPwW6VlHBGjMsRohBoKTqjkcpGIwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxTCCAa2gAwIBAgIUJxMT/hZ29ymphpoGEsccGFKMFiswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowKDEmMCQGA1UEAwwdd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20w
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
 9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw
 4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
-AgMBAAEwDQYJKoZIhvcNAQELBQADggEBALPMSjQk4Ekj1L75oxZLjNIjbudfcAcN
-tfrLPJtS5IyO1DeWAYl823uPAMV4D6anbmbUH7h0fz/BpKyMg9NUm889tujoIlir
-iKIriVxSAPjACxSyyxQM7U+useSeopuda/09C53sfq9gNKtRfXJnFWnnMv24Pkub
-q+JfAk6+eBtmhQ94gVwAdSBVi8Krf2iz8nAJX7KI8iDA3lpG/XCVdMqY4lOjuvNU
-WZOpy/HMeyjqi9TpgGWxqrzWahGdabciSxsqeEdXSi+qUr0qmjtcj/imAxpIyviO
-7irgYfZDjR5MAVAJBdiWrWSd2jH/KuXBOUxA0nIzTFlWpt+8jT3QyAU=
+AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAA0yadPBtA6TEvDC/mEaq8/S1soOjGPW
+FTOSBHX2+kSqI8P5qI+mT/w2gIc/YMBSGn6A5eJtnROn9ue2iKVPywwpecw66TAf
+vBoIedyhnJmrRnyVzRZGPiMfjYIU3ZOscRCJAkjkby1KVAbmZwPctYMsJdQKv+rM
+lK9i0lu5IFu36kWfBBL1VcV9h5FML67rbQshVa3ad8rMxIi7IVhZNLKV81Bd7zy2
+JmGQP8uJw8AG+JQV7i7b7ArPlFWpl2yvy125MRokPZKhsEpXjt+up+63FVHsryBR
+ThQWUePOP2OQze2fFg4BnFrlEi56xtRbNTkvi3AQlmlVgVvENiPvdlM=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
+++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIUU0RnLUD5hf3Hzr+rM9OsZURmJJwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC8zCCAdugAwIBAgIUR8fBqk4oNImFfPxuAlryBnoyE/EwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowKDEmMCQGA1UEAwwdd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20w
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
 9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw
 4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
 AgMBAAGjLDAqMCgGA1UdEQQhMB+CHXd3dy5iYW5rMS5jb20Ad3d3LmJhZC1ndXku
-Y29tMA0GCSqGSIb3DQEBCwUAA4IBAQCG95N1/sYE5+JB+loxrd6jnPh7KkgfQ0ci
-vHIeu+onn4pOTwmNTlOij1xdWq1gafRxhaRihETpycwYlrmvBpA+WSwbSV8QeHlB
-WLjwr9EFzY2i6gAEDENKMEReW44KKvAm8n6SWA1oVr4Jm6fKkxTV4jE5RL5wGLyI
-IhmIJU8FzJMdAELRb3f0O4KAyoYdN2tjPXSNZ0pK9VYRJAxyX4A8sjGQI3S/hhn4
-S9xopNRiILbZbo11q/+D4GIgqttFdmoX+pMfa7kCtYE1LrWImCd3cputahnxYCc0
-44lgi07kmFcnpPE8wUAJJaubg+B8F4eltTQ3q0yqDwqLVdQz0sCH
+Y29tMA0GCSqGSIb3DQEBCwUAA4IBAQCiXSyXngzaXiHJTOQODOD2gmTUTYRtIZhg
+vt73FUnJz6cIWLctkyCFqg4DyAuPOPKOmn0U+Zf4QbhvJt4noFGyT0jPvMrhBLXm
+0YGcWXcXdE8XlkK1DWDbGvUWoVFopcOtHI9LtF3RC/t5z9Pvl9yvHk+iy6IcDz1Z
+VdKlBEcPedtTVS0SRqVhP+ABqlGvvdMob+BWzB0e4YiRMDo3/+5YmxbdYqSWnxKp
+FE9PprQLbNQcoWHb76/ziOl/4ahnQ7Al3cHNc+K+6OIa2606nOygSrZ2J3LowWJw
+oSrefaoYt+1M8eLTwcMIb0zR4DyfG20Nh0q8mCDBlm+qYnuvkwHM
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
+++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUL5Eo/RStc3/mpB0NvFoRjToVs8cwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC6TCCAdGgAwIBAgIUX++WHdKez3AlCF6gKM5ISlSkRfIwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowHjEcMBoGA1UEAwwTZW1iZWRkZWQgTlVMIGluIFNBTjCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
 HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMsMCow
 KAYDVR0RBCEwH4Idd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20wDQYJKoZI
-hvcNAQELBQADggEBAAUSLdhRU8eF9NNAiG2pJZRbBOR9rqAt7XAsB+vOVg9eKz1e
-k+IBiDjldlH5x3vPcN0+mdLmrlXiBKnq2wAEawiZKtIwwEeKdaGT3tAafDFjU+nX
-BXjSjUkkTaIXrxY1bU2aA7hP7LIks6xjnKdVLBPr+RzP7KIb0VWVmOltPZWQe4SJ
-Z/szT0jNLrwN+kfrfKfWCY7IO0EUI0hforqhGlRnGJu/7Iu1t0qx2k8o/y1njr1f
-gtDGVjgIFUV0w+NESo85Y3vJm74RZpaOxayf/briNb4lEDVDFWctgx3M7I0cgxwn
-HylNoPHPHBPkicwAvBu2iF1fmtSHl029BYeoTlU=
+hvcNAQELBQADggEBAB6tBjVmcvvrefZfkBCK7RZaCyfI3O7Rmqku3sYKnVGzuCAu
+DYr6m+zz3vUkdmEUSm8aIMtqh8HjVqZTPNxqnbpkPQnGhMkR/PZdiJX0Vb/AeoNK
+EKHBCxteZ4UR0U7xvFI96UzE64X9Xm4h/8xBS32w+IXWJkbhqeVZwfw9zi4wjsiv
+JHZKuO0H4UPpTX2SGCwcwS9wfgy6m6/MeHE1w8udWhe7d3bUYUwKE/OhFo5ay6P/
+WQSSAfoGW3BeR9yYhfTYrMe/LdCRwWRDw66s3fPlZ3UzlgsXn2lYq7mJL5jo3/7T
+2OXLQgYynYxnOp248F0/Z9d/ypdxAQRWNdUUfgk=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
+++ b/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC7jCCAdagAwIBAgIUcxAl/9Yq1kkMOhH+QeyGahu4eTIwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC7jCCAdagAwIBAgIUScFi9MBQyOJuqbkmEcq9iBmQwZ8wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLYmFkLWd1eS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjOTA3MDUGA1UdEQQu
 MCyCC2JhZC1ndXkuY29tgh13d3cuYmFuazEuY29tAHd3dy5iYWQtZ3V5LmNvbTAN
-BgkqhkiG9w0BAQsFAAOCAQEAWHyE54EshgU8Zqta2fzea1rFhOwMqnyHKAeJhMsy
-Jr1PxDl2D+IUxA3hD/kZ4WdfGCCZoN0ZFzc3OsSqF8whElvqHNX6om4sJELoI31G
-s7do/xDrUzS01gzGYQiJB9aLNZuEh5juCRVYu26N2x8EDvBq00WCbu6tupGWYzo7
-3Y3VvWr0XDuX0tz8uslLgub+vF8kqwbg9tirvy9vat+Dnc//uAUqofoZa5+rxY3V
-WQj0X5jnX7LaPBsp4s4fpr5TlNfVArjqIHf3PffWUB4vKtD1/uMANm3UMbPeozcR
-LbMWG5c8taXJxoIHLE+3zDagnhuHFqToJWZaVzm+OsYzFQ==
+BgkqhkiG9w0BAQsFAAOCAQEAiFM57BgUNKF/FN/+jUjIU/6JI3RGUwhMoayS8akB
+5HFo7iCnbaFFsBfi0gNNacVqs+xEsNsgQ8WEsEJ/MbDmchRSQ7ohX+PzOoA+9LET
+Xd5pU/l4YOSGdNE3KfvEHQBmWjoawZa6owuAspHRz1jPJ1gO0CRzKOFDQkwOoWtH
+Os6VII9Uyrswj3bgo9fdFKomu012JWmZAfRmDR3hK7sOhIhB1h2qr1N4ZNqQ8LwC
+ZMSdD7Nn7DOAPKuIMXOzJnozq7BC8QptAMyp8wyzsREahThLZLPRCnM7iBmfOrwZ
+3qGgr7RV75Bi0F62zpR6cx2W5w5zQDdHZq7Z3DpscLYOqA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAcegAwIBAgIUCTT32QCK3bcz7+j06357fY4bfT0wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1jYS1hbGwtdXNhZ2VzMIIBIjAN
+MIIC3zCCAcegAwIBAgIUb97elRZYIz5arozMyWIiPXABSFAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1jYS1hbGwtdXNhZ2VzMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
 ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYk
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 ox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB/jANBgkqhkiG9w0BAQsFAAOC
-AQEAM5J6N+2Dtv3r60E5mhACY7MZ5YBe8RH24VXjwjIQp1hrS45D24D18YD5q6l8
-ENqQR4vCXlDRIvEWjHJRl5tnfnKvISuz6QUlw78u5bZp6DDo6UI0Yw4OFOwiik8V
-qLmB//9/fKR8PtCuetpxSenqXJ40lkq2shyyzvVX6wgpB78P45rgXfB5l8jjLD1D
-+ANmT6jAlBWECvyXebhG5ETv0Wpish0M4SZwm/f8yGuU8HGifGhPbplnUaafugNr
-Pmd8L/95i6mgx4vdmT3N4KGjs9bKEUCcyOcu6+9Rc8eo/kHMpKX/Jy4j7z2HU1df
-0bGALWPi0psxrq6JqS0I8Kl2VQ==
+AQEAgRB8PoqBAmfYiQQ0zih39udMuhxKUF1H4mzLUrQl23X2tDhJpl9+UEn+CfJq
+bSyudFwwP3dnmNLgqR/+1ueY+rmluEOf/20PJnZEOp/Td0jpwIAWgnIBKx0+VelE
+nc+Zd3DFlgiRpwnI/BOup20eDJPSarmzziCNynus+ZyEmvTAEh+1MW4uPHK44F6t
+6ZKNrnQtBJiRCvTB07ljKAQHa6zWEkL06V5muCDwaUAhfed/a3sfrbmmFDR4l9Ot
+fnw4/n60PS5IEBAZkzQalik997KW9ZKZsO85yh/4orbKk1czZyMpwpGAF4uLbhhM
+xPqCE+THrnVw2V6WNE5hqBVw+w==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUbwaB3dH4BCaTeH9O/VJU91Gm5tcwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE2MTEy
-NzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAhMR8wHQYDVQQDDBZjYS1taXNzaW5n
+MIIC8TCCAdmgAwIBAgIUN0UtOpFF0gpu3aI46oPQfaxITtUwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE3MTEy
+NzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAhMR8wHQYDVQQDDBZjYS1taXNzaW5n
 LWtleUNlcnRTaWduMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
 qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
 WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
 rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPv
 JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
 Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
 clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB
-+jANBgkqhkiG9w0BAQsFAAOCAQEAPELdERWYVMqheijkosNUGoWjT6uTIg2nWK0r
-vtGuR6MzGF7KFMRVUyZH2AQADdVNmExedGODTJZgLYdYWfEdyakT2yjK6eh8aKq/
-51G/wkUoc7C4pThO660ONr11+tYkDuDWngPqpxqjLKEFz5/Pg8bOve8IPjB8QNYc
-STlCOyKlD/w2Xq47ULav1oK8q7elME0/R5vsUwfLRGuJ+XgqkGGInSiNEhakM8se
-Bs8V/23XM4HcMhF1MMKoiKprAIysQ1wbtunBOMZzjWhdIO5U7Man+4O1FG4mczeV
-rUL6i85+vgaB6XacnYMCiL63yUBHLz+0fqw5aRlGDmMywGVhvg==
++jANBgkqhkiG9w0BAQsFAAOCAQEAT4Tagnv0iIuszyudWqz5slwsN0nLLH1kWqKD
+JVwwF7qCA3jY0XK8/WJLNhFmzdjlPz5LYh0VOcL1DxPa8pT/T0I1kUviNooDptlm
+PljAN13zai7d4XLzp5PM1mV1SKEPkCghTIkBUtkFydF6iOdM3By0RaQlpbVo99XN
+U+vy6HCRHy/iRso+aIHIU0xDY39GizDPvALSnpBmbPqNi2/KKRtgHzzFAoybt/1g
+MkiaxbjZtDVkyop0qFNP0xm1RebnkGfpKR6U69OAYUxLQ3QmYkRHbPsxkrPFgyA+
+PnRmMk6yyaX95I4uPA3QBGIiKGO4zf5+rDLRK2RN7b7oNpwKoA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC6DCCAdCgAwIBAgIUH5Ss9SwYi907tzwj4lgiaI9L8NowDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTYx
-MTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGNhLW5vLWtl
+MIIC6DCCAdCgAwIBAgIUXT6KlcfS7Ea3B77wTzEUruxvzGowDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTcx
+MTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGNhLW5vLWtl
 eVVzYWdlLWV4dGVuc2lvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
 gg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g3
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
 /kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG
-9w0BAQsFAAOCAQEAhqXucDdgeTX5NQ3nAYlxJ02cB7eDsxq32Gquv2rrdlVCBh2n
-aoBW5rdqbfTNm4kZIAWmk0dNnDJBuI/UGjOwVoznumMFJJeS39Q9UxhUKaURJ1oF
-Ag1l4x5rXmYNdM/tVK2c8KAeOmOdiU4nkA8F/vJB65DRkbn1tlAOtpMKzPs7QQCf
-2oX4kYrobiMVo8473tZeAZf6o0q1I3ANiokd5SaQsOdjnrtE4XSqyaV4YgoCHwAX
-2I8xnxnsp7SXqYpk0/1eAfFBTZSbSDJg7Fo4Si/k4M+HGI+XY0WuABGo/CWspYVW
-Hdisec6zTgNHt/q6ODQP+ZDU39r9LFKPjOX5PA==
+9w0BAQsFAAOCAQEAfRK9tEgAcRUk4aPSuST6OapFwEO9QAtCj7EHlujPGF8u6GEL
+oOaCye/2aBFpMCxpr+395UX6dt8uYOtwAtcU6YXjgbrNCrNt1LDUoR3IxBosXKGz
+NywjI2l+MQfl5BA9ahovEdxuY07IGfbXDLgJL2guojxnt/Jx5AXF4PqBsC0+dIm8
+q7t+n97dWwG5Vm/p8x6fvPgT6xHq0QSxfvr8fEi+PLoxMGDzCHN+sNzskpzdJlQ/
+jl2HARWwzugXfNEwALkPeAVSPy5OgrKbgv9wa0QRXSwhahrJ2uOQLPgsWNvG7Rsp
+hEr5yjqO8D36koK7VYtxLqm8I1xuZL7T/IOKVw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUR499arIl3rRf9C6uCoERXSRpgucwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0U2lnbi1hbmQt
+MIIC5jCCAc6gAwIBAgIUQcOMyt0M0GfMURyV9hUEXdEpfBYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0U2lnbi1hbmQt
 a2V5RW5jaXBoZXJtZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
 D/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfT
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAiQwDQYJKoZIhvcN
-AQELBQADggEBAIG0QAtzwNb3T25MxsOty+d/Ll9SJkwbt+fZLr93G2YSkghK6rq0
-j5K74iwywB2jP54PBgq1OHMmADOq7slaMgSTc1b7jmKd8pMa2HMI7rdR7hEID7cm
-4KtC8MwRk6K3xKZit08KNM/J1sZC7X3DBellFKv/TG672PAAOVQAghpeBxX+8fzQ
-6yfbFdmGMyp84N4zfe/a+C3MM/8Y+zAG3SI8iMHXYCwYcgoIuZVDwUT3BIZhHTAe
-eJdaijUqQYIU/PzR+3eXhJFmQkUHkJFOpXA2GVaoOr45aiAPOH6EirAPGCnqvcFG
-eia2GuN/giB/t9KUscDOpuL7np2rzzPCBys=
+AQELBQADggEBAK5SGAEH4EtjdmzQJ1S+xjUgv9Ux4Fcp/75GsUOv/BEJuBuvejL7
+CMqT4nCIM3xZletG+Kn70SYPEAN3xnjBK6O3mfsngDqTg793n1P/FAhD+Dzid3ph
+WTFIr3ASfJ4bydzn23+6RZXB0zilGxZLpKTX4bkya9G8UWPjulhPRP6ZwiH9dZh+
+DRyklI3Ku/01YYhTGJ/QKc5np5h6PsXlHid1E/8KU4yqCt5IxVWI6E5S1FWm0IYS
+2qB1dWiiSloMofXQV4pg5vSIof4kkMC2OJ16YTZ6J7nFE8FmtShgRVnx3cmVMsMo
+iROUw8U0dSLhXe81ia+S+mgfp6UlhzooqZE=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAdegAwIBAgIUXbbu5QEdk67MJBuR+Jn61NjL/ZUwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE2MTEy
-NzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0
+MIIC7zCCAdegAwIBAgIUOR1kFSeBbVNEcPiJPKW5vQu/0yEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE3MTEy
+NzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0
 U2lnbi1hbmQta2V5RW5jaXBoZXJtZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAiQw
-DQYJKoZIhvcNAQELBQADggEBAKShWWJp7q5tdI5cmGbxw4k+GHUeQAJzMrKeMEp0
-SB29S4yJ+YiFzz4JJd1L2t8W+UPQ0/ufKycg/bbyXX76rlXsYx/KOLMiqI7OYEz2
-WCzz/bs8C1a5j2pXfyZ571T8ysAKTzB01A9oNnHmi83sIV0uLqBkfxz6/HJIJsq5
-1IwpzHbVuvRR+dxgKPalbOaJtK68wvH2f6/GXXhQBq+Tz+ihsQI4iu23uKuOEukn
-m9Mbbm7+QNmG0E8htB0KRcG00M6yCggPfoWiLWKRUzST7jnm2Z31Qdc9tUOWACSp
-YUKogWIfVgh4eMYpxhpCxdZL/mof4MRRbAHKpuf5wMDDC04=
+DQYJKoZIhvcNAQELBQADggEBALMrOYK4yN9OH4266LcpnxU3Z6D+asyOzOeB5gE5
+KlZ4nQxK9eikA5SU64/oeHv4Cxy89JP9pr3A+lGne+fSB/E0bcgzv19E/qgOgBCV
+TjZNp7FrtiDIOLd6/iRIib3JVi/9opOZeRPbZVA+lp46IWWTm/mxg2fCYvb0/ZZQ
+/96U1N0SEyI/BRy947Kdpu3Y/9p147TBelbCilq9swev8Cd8FSy/Jix+SpMc7bSe
+Ni1n/VNzBlTOqeEbpNFIW5yTC7eebzr8m9pwAO4yjK1NOsLhiNigZbjj9xTdmH0b
+cEHwY1gL8bFlhiBPZRDlHZM62xMPz+tiTaEe2RM+Dr7Mx6k=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUd6Rg1B8P5oFrfhaNoMZ01YJoVwwwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTYx
-MTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMC0xKzApBgNVBAMMImVlLWtleUNl
+MIIC8TCCAdmgAwIBAgIUGTU3sN9xjOfdw/0nXrEZepdTwJ8wDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTcx
+MTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMC0xKzApBgNVBAMMImVlLWtleUNl
 cnRTaWduLWFuZC1rZXlFbmNpcGhlcm1lbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
 5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQ
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQEAwIC
-JDANBgkqhkiG9w0BAQsFAAOCAQEAi9cJqmI3MkRymu+BLjr4dPLnKMGECp0SEeLp
-IRrYb6Ks1/tD+wU3kvY6gmWy0+J/4LElcfSUcU9XmUdyCz+Q5wloPH/onusVIRMg
-0a30vqcK+n7SGVfknyAdSs6f8Cx23uS4kPT3oQxjzbT4dby317Mn6Qd7cwT4SvVy
-xDlcBTOypNZ6qE5Yo/QrZNSTH6e9GbGERsPHgDXtDqKQBU2pzAi0QPaeUuRIBKux
-485p1HhIOOBjk80mZ+/TO+wxcRgH2bGXh9V450PvDBS4/d+jhV29lOq8C/pRgeHv
-WarbDnT1Bnpy1QIt0Z/e27/Hn4+AR++dcwqLav0GEYuNBGl7+w==
+JDANBgkqhkiG9w0BAQsFAAOCAQEAhUFBloj62zUkCWsto24p8sZpg3UwhiE/cxUL
+LTmlhRQm7q2YhJ+PG8Ua0r8mu2kVnXIuE1+SYEQ98YjlL0AObHC+Sddg8urLt5Fg
+badD7SJ9IAvUvF6pP1fm4IOQCiMfCrhV8/rdt0JQzRJpp3r2adsI+n7S26wUrKqh
+14CNMdG5Fb3OXHlzwsHHVLLkTiVCFnhUh0/UBUMiBG/dE9mIonOP+KZlujiSEWjW
+TUASEeXsahl2diw8eFU1Q1TmQzDi660Lvkq+dj0qn0dsOwd48gusliRw3rfFPUSX
+bfacgDYq9ElgHA+8Uj6eHJvvSl9BlVNaUZ2Kx86vLjAWl38L1w==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1zCCAb+gAwIBAgIUW8sHaN4c0MzbPmyx5ys4oWug95wwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0U2lnbi1vbmx5
+MIIC1zCCAb+gAwIBAgIUBQgye3B09ZZwvhPlL44nql2tYkwwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0U2lnbi1vbmx5
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAEW5iJEt
-IWBVYGoyUg9UFqnj06wYyO8dvt2ozOIjzxAysh9DTgtlzx7s19sjav+vND2oqw6+
-P1kk2f/ve0o+FdQgQ6SlZomsD+SYRWo9bIT0m2V5qX5tAgVXoITfRrMxszyNXuRe
-F54wQrZ8uq1vS40dCXnh3WMuKMsYSzalCl9YwR38z2wD0ERmkXBd2uetBHvS10AL
-/OEiEvVy4B5g6LYNCqzpV+T3p6aUr2cNpTGQePoqdTqx+yuy98NszSN2zwazx8nP
-0/G37AhhxyjOYhzg6GPcFzqzG9s8ao2gEdJuFDwAA4icChPBLVTyf2jBvwwcskLN
-aYO4vUJ8MuEtFLk=
+jQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAKatuCnJ
+B8s1PIOeelYwATzulgm1D9+ul2GXFHAJ2tBkgNXL2mnLjluxe4LsFBxm64AwADZS
+NyxeT2YUGEpLdlCIBxWI3jWHCS2PyPGVFLmwViFpYwaTiJbudnYBxq2B0HzkjUiY
+gvRZ5u9770ZMKbxcBd8gnDJgMJYJ84dB+eCZg/7tQZX15LfxRv/I4pv9dumQye40
+LoKDol42gJbN4z4JGE63qJZYyUZv8SVuD4UnZN2+tNS+khTNbbOwIMonAi0ktE2/
+bVHNgWbZuap9Um8VsFqa82d4ldzlzCUFaxSaSAhs+sQO1oiT4D8VbHjx7j7vKj6x
+p1tbhHPWrVGdxb0=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAcigAwIBAgIUXY8iJjbxcdCGx4puTvAHjlZKu7gwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE2MTEy
-NzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0
+MIIC4DCCAcigAwIBAgIUNejYVo8QFYjdeuYYI+yVRvK6zc4wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE3MTEy
+NzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0
 U2lnbi1vbmx5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
 sdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbY
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQAD
-ggEBAELvFAYRkK7n9g2YvtarQ1brpBfCESyMR2h6q//Pb26B/Dy+RG50N0xJNm3z
-VOdUOfcbG7Xm8rEf1yrt7iFmY4WlnBF6rBEkstqQyaHmuF/UfZ1vEtXUknwmnNzg
-qNLdJdqmMn5xGSIEnWpGfFkF7T3clZzFsci1S/PB+suAeXvwyetEvmvzCAxxR9zX
-N9DLpE/6Cr1GGA6FiKGdcswHFgAENJneNZVD+Kj5DD5z6AtIgnmC5qGZxpIaB0xy
-wtSg3mSYLPWShiM1YhdTtksTT91BXxmJGKvy7PC4ZAHO2oMNTLxymla2Q7cXSZgx
-aLtumgOQFG9TgB9BHpTb/Avbi/M=
+ggEBAKkFdyn+csX13Zd4gEIFf2q6ih7YLCmVlhPOYwGPLEtk38Ps5cGZqMmSV4ch
+usH2P/YPuKmn6uzH1+5Izxf3k4t8YzYjrQ8dpheQthzECQHyxI2MK6VIp5FUN3RE
+RCA6WR6OB2Q54h/NiyWNIKdmoQq+ASv32zGnMkw5Ekp85EK+cL67TqHu224EP6l2
+d+hf1YVSrdGMES15rw56Y3pY6ICeSfxW6476tXYp0LtRbUfSgQKAhlz54sg8NZgU
+CVsleyGfvE6nKRbZPYDzP3kY3YaYosOVW0zeRaLDLnf12KMtqRV+VsB2159CWGjQ
+HaYd+Hw4wOnfam/l4sCKflniA4Y=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUOR32L6nFT38db7wt/Y2G+YKETjgwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTYx
-MTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME2VlLWtleUNl
+MIIC4jCCAcqgAwIBAgIUJwGNGhqGiZlNM4TLfWiY2RA1CqowDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTcx
+MTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME2VlLWtleUNl
 cnRTaWduLW9ubHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
 aRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8n
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQEAwICBDANBgkqhkiG9w0BAQsF
-AAOCAQEAOj3zxwsK4ipJ5X13gxENhjgyPOhpGtriXJgf019KtyjH+nPVAZ8LSGHf
-cvjQs/KdN4lCY0CpR1JyudY1+g2i8EtilcPKpCgRgfX59qXGW4ClWlNwTfGmRZ2m
-IzYrC7rM6g0nBiOODDkulAloWB7hBepXJG3VpjyJ6zFkIfvPwTgdWCfjxc19Cn2X
-k76rQbSkMXi3InLjZ6Rbz2UpbioRJO0BiyUKGdbJx/bhobCZL2OFpmBKzFk3lqGr
-38A8G4YRjwz2SRmxwBXjWyPfuAIagNd2hq9TjtpSc4hXmTduCBRyLZcfyImrfRqa
-tlEmAA+Ci8oGFmiyiltI3x1hIKsfpg==
+AAOCAQEAerRHHxZRB4eN7qrpKpgQMOt1HHZ91HRzs+dYLJdpVifwBTquXCoGkYJL
+irQF9QRA01I90tlMp65U7/HR9x4ZbSry4y5x9RXR2mL5MbggBJ538ezR69DJ/Bh8
+hM3iifS/dC+Npw9LtB+0yPYRr1F9V9FJOew9MvqW1/T5eGSibbH1UTjKPERr8W2k
+7XWu8e63p9yT6cRDNett7WNF5yz41nuWvQkX30iqnRtd7lSfXBZdYkj1tmPFbScw
+/8t+K6iGqenFUFOEbCRhvVu3YkTS2lOUuoQ4lpWe+I/x0oLDE92BULRYDXmnfgp8
+VUAGoift8CiMLKW0xQfn6LGItAWfnA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC2zCCAcOgAwIBAgIUT2cgGKEu9ofvgYrltgtAjIZnlmcwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNpcGhlcm1lbnQt
+MIIC2zCCAcOgAwIBAgIUPQXYWYkvGI8/MAf9hmtPsqna0HAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNpcGhlcm1lbnQt
 b25seTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1u
 togGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6
 pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqL
 KkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3Zlqq
 fgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3sv
 Im9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6za
-GAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEBCwUAA4IBAQAs
-dZyDdy6RUC51ZsX4ZfMr0biz3hUIi5xZxc13uCzbYUrYUcbu28hXrygdc4VuLW2C
-/l44n8NaEHqe8Nlcs9GJhclSmhrPJEqRFOh9xw/mktNr1Bh70azmP/Z8AYhHQq6w
-uVgxWNC+KlOsoe+q7TF0wYIqbuxFbdZYDiYSf9ZiTRqPTjVHLbysD2EIwjHUXKJX
-ySonsmDXp0vMj7sdTOu3nSHKsPHPRAnPeCP2UcxkLT6H3le6BAqufT2ahx15RqAi
-jo1N138/Fn1P8u7iKNmgOeXHFqfh9fQDGTKQjrcLMmD1RAffucN6yl+cTK7AzsA1
-ZIam53DfgutdgGi0rHyd
+GAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEBCwUAA4IBAQCK
+d2mhQmwtcQeUM3353hQ8MFdf8J+naza1zcs3gSTuty/tq3cJzPkBipYy/oCfxxsR
+UXIwCMXCK7c7AFEgE4Cl+mkBfW2cAPH4awwvfMipkn1KQimCHB8/Na+1YIridqYC
+K6Wx/PryxtlMqgO0UDRELSJeFhoSCVybwByeTMQ5FkVgEIQfJrM/e+wpUmN1S5CB
+9EAiHJ1MHvmq6XJ7Fh01qHSJcOYzfq43GTxoKitiuDe7XfEQ2x8ZLc3AcPx57rkO
+j6KdRRXz5e4bTPUg8EjW1X5tDsWh52/w0r8fg1/QsK/08bNb+UnUg+xv+7oyZKuv
+Ved4BJX7Cw39fEJa3Dka
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC5DCCAcygAwIBAgIUby/N5evomqhd1xY21QVtnHw2+M0wDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE2MTEy
-NzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNp
+MIIC5DCCAcygAwIBAgIUfze9G5i9zetO6k1hBlDL/dWustMwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE3MTEy
+NzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNp
 cGhlcm1lbnQtb25seTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
 UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
 r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
 fq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD
 7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnv
 uRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj
 +nJRxDHVA6zaGAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEB
-CwUAA4IBAQAtXqLMEQE7Og/eUUtqtR6S1v/s/LjrztGlT1Yq3o/nVnUi89Aejslb
-xp1rYSFgifRNX+RNfWAljXiSnV1ceBOS9NGrmyktOTe7E/OAVCEXaMJB4J0s0P8/
-wlOzyrZQ/Z8t4UhRQz+IYqh+zFFfu8990Cv81lG7S2zzGyxtM34+iE+waBuL+mAJ
-7PbHgbGXhgFQLIeWbWdFo3iljaj8Gf+w2qyNGeG/etWZSAsh3fySuKc3dasJMYwr
-nbCiPih5QZ4spE0Ph+3t8sn0pwgUHObSJLApGBag4Yt0xFPWbPqx5zfqvXVyL/QB
-w0D190G23xRHdGJLRAVEqRZIerc5b/hD
+CwUAA4IBAQCkGizAs5fyZTMBHe1uWR30JCGhpYJy+z+vUEEqUGtmZ2RnlpR3iF7p
+JwI8nhSJBLlWqGMr/Q/n5hGarNichKsLXlOkRsNSx+ribE45DRLR8wVqobzXm86H
+95o9fQRLX4j9lFpb8jdvKGC8hixLnom7u6ezOGaqeRcGR7FVpNtDyTnttqR4bJJB
+igUDBBqR4Quwom+m7tz4GJZ8cE+oDbFRe6HOZRsBNIsvKDP37uM2nTgT+yWqQ1xE
+yYjCzLTGeUrjurTm7cBNpJgXUloFIO0ZgkqgZGztzi0N+FfyKC6lgAmiVm+WBU/Z
+DzNHWN/h/W6SNynPabaa1BxTyhZja4KW
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUBzg8Vriqb2mFyIgt/0+eH8E4yo4wDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTYx
-MTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMCIxIDAeBgNVBAMMF2VlLWtleUVu
+MIIC5jCCAc6gAwIBAgIUAcDr2WR1iUruL7oCRtbG2rP14rUwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTcx
+MTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMCIxIDAeBgNVBAMMF2VlLWtleUVu
 Y2lwaGVybWVudC1vbmx5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
 D/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfT
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCBSAwDQYJKoZIhvcN
-AQELBQADggEBADbeosL6iGUAqG8Rz9ks5sDGKSlCLsGuZN4B3wSPlDqdEYQ/zQMo
-exe7N89UVtQTMTt+lc4hMbc5Su41IAKTfsKZGhhYVCVbSKGL0fcEiqdGhM11NSDp
-30wFdPgvPhzkG3gihbv3/ZqTyMm8OJIbUJ2ZGKd9j2K417UZSRSw5d8I2VqF8N+n
-0l+R2eNZ3cRZa5PnD+2KAnKjrh/aPKxPXdqUqLJXH9fr4mcYK4Rkh69EQKfDnY5/
-HmyhJXAtNqYQ56FsfJC4y6FrGs4GiL5xb/f8C8fyJ/hvXUNrGfBffh+zPcsk6aRP
-Sk7IIAcdAsHVfb5QKHNKeZFdz91IDJ7hpnM=
+AQELBQADggEBACBygqaa5zlis80F2XmzUJYoTK7zmKyQlVY51o1BnBXgvK/f9ly6
+/BPxJmTKkqcx9jaFq94d6AQWRXKTJ5eaWbhKNwGmC25tY/nSlaSM7qELnJLJnuwS
+R6iut/BkHXX5glfK7pXbP23p1kAcVia4OL8XOijiN/iAZdlnPRaDI49RQnhcJ/YG
+X+J5I2JVvPwi/hnq0IbJmJS560wk4b/k93mcm8Fk90UhBy3vvaR7P/kvXg+UgxqF
+YSgYhk3wsJcPPJec0SdVyqBWBiEZ5Ji7SWRlCw9Hs68hARsveEcvG8XibHe5Mx7r
+qxsnqCPbqSaMg/RtMAMhylWnNE9OmEDc9Pw=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyzCCAbOgAwIBAgIUfRhCW7q0AxePLpHps0pmyVQ08YQwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE2MTEyNzAwMDAwMFoY
-DzIwMTkwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlVc2FnZS1leHRl
+MIICyzCCAbOgAwIBAgIUabn1P5vHGWNbniCz2jR+0P83guEwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE3MTEyNzAwMDAwMFoY
+DzIwMjAwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlVc2FnZS1leHRl
 bnNpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
 iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
-2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHxoEd966vKEhMO4QazO9YuA
-hM5PWy9T8AfB8CX0Mil3ntm80eKliMTvb4ZAWDaNDjO3J+rvfZoAAQ9XPTdxSk47
-iHi7OlkJvLg4sFTBWB8N24DO5F8F4Ia+8m4+V47GpTkyWID+sHo7UCkYFlANtpPT
-fbQTp+UnzEl5ARcI2FOQbhe25uKBcs+VjdLFAJgmtwvsGhPsNlecpn+iimulT3O+
-lMogHdZTIPrBiwsyAWbsaWPyOkV52jiv3kVRdyInup8gM3ZwhMY6HXaXB7xAJWb2
-b47inYPNTZQylIysSS6wH5UEqcp3diARzxcXD+1MaPnvrN8qs+UJvSd0Lzgzxo8=
+2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEnHENwgvfHA+Zd3b1CARZk+
+kkIrIyjqjAe+3OaDwOR+l4UVlqupIXdxDh6BciaYKQf8AJ7K6a2SmnKH1SSqnD+o
+ny8SL5YBT/dMgSQUk1RDP17BFOWo6VWhcJta/vAJWyfDJml9tIVng7mtU88pnbcZ
+CiYWNBpVM8lXlLCNkMQbYSBvYc5Rw824fQ2iw52SJ5K5FclPLQwG4Pw5oBMolx9T
+FbLZ2d+hMjuv6RavhuTwNusP6RhhlLkuH4Gc9iWq1HyLoyvAfnb+Bd+aLuRySSFO
+d1ByfybeRSXrHWhWIm7nCsKxxvNaHg+kvwyyEa3UGfIFDYgmmB160nGq2knURTc=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUAaUjtNMLbBj51jG4DFMb3pIyGRcwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE2MTEy
-NzAwMDAwMFoYDzIwMTkwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlV
+MIIC1DCCAbygAwIBAgIUCSI4/QLFCO4S1TxNLafO74B+If4wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE3MTEy
+NzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlV
 c2FnZS1leHRlbnNpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP
 8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OI
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
-I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK0+wgNLn9Oi
-SU1BG8cJDe4kq4mICpM7rWQbHoqRaDbe8g1XFd4e4+QM6fFrycExVFimk9Qs2S39
-bwg2A7nNUgP31NbyOhT+ZuUogQPXyYL4MGoreqssbGgzcKLjc2eOnw/egSS+k2Wb
-O3GpFXpGYDZ53hEPkHJ4mUMw9iTQc2DAmvs0Yi1uGN4fDsyFUb4avELTYDQZNhw3
-bDOws/Zs3CwNo+U24v7hch3omxZzV56P/XW9hu5eDVhmvAmG7dO4TrjJPPHwpF08
-L8Oe/myEFDwFjtC7HqQ+Hmn7SfiVEJbeJIjHzZogzKe0yGOrdIClH5nWDLWzPFDo
-o+3a3NfDJf4=
+I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEAv6yg1ghZZ
+YOo0DYTg6RZrUkmxoZBeEnpM+QXl85UtXg2Bq2xwKqHiBUnMsdeesZVJz2XRLGnr
+R58c1WQk4g2NL+rezQOsPRXwaTMNFIgn7j0Sq6nMH46uqmgu+UUFv+P8ROGVcSwx
+Et40GomtPVR5TCuJ9o6wutAlTjox5oeSiGf5kFSBSeU8PDbk5xE7bhS+248HVmm4
+Bme72HlhWUTasmflMbOXAwC97aF+GCv+lb/muqs+kXqMGzhoFu8pqGdXdG6+3Py7
+mjTpg2AAeUFjBaMlRCPxT4RAP33VtkVeIioFMgj/6GrWIIJ/QfIgW96QeXpN4tZT
+jMW01EbfqlU=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
+++ b/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1jCCAb6gAwIBAgIUQQejj2AhG3SAdteLKfdrLrLGkocwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTYx
-MTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGVlLW5vLWtl
+MIIC1jCCAb6gAwIBAgIUXVk3NqqES9KnS7PRvcon7qcKD0owDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTcx
+MTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGVlLW5vLWtl
 eVVzYWdlLWV4dGVuc2lvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
 gg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g3
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
-/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAV40oB7vU
-K3jSd6n0S8KB1DDuUO++bgiQucdKXOJ0oVBYWzWvqrizBq99HGg7W4yYPcZpl9qx
-0zCJmWTiV00a5enuJpz0XfXvvzuswClGtr7ZPYz1hTbwNkZKDmPEfSIlKb0qijxu
-IOP0WyweIny3s4yqNOViqwWCHJ1vr2OfzSw5T+tfT2biWAu8k1qR/qjwAB0gAsj0
-vZoT4oXdrfL4h8NQFqUHrRXCCUgPrj9jlGZ+7bUxzWQaVOrgB7QtFk9cnKZFAImX
-9ImrRqNaCpQOCC+nHD8fymSA4UBbzLIbmSgqiH9rGzFDQVoKzYayixjdxw3+RHYN
-jPwtNtoPzj5MOQ==
+/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAA8ZLijT/
+0TmP1hSOhwm0pu7c4QVUuGWTCktav0BFG+rKo8PBs9sSOcLTam9PH8oxFXkw3VQC
+4kXSwJz0s9rQRWKlLR2aKiQdFtvZgmtTdffvTsjH/srPpsbyXMhnaEO22a2atYcw
+LFDhVTa8UaV0ZoMRPvEh2K8rA8Cmv5HGA8LCwSqY4EqEiuNsjESOd+ckKHKZWRuH
+f0aXuFrFLkSSYmCVGNVAn7aSFgYZg1ohGvYbldMao55jm6lBtH+APyi65acvPdZl
++ORDlXrGg5lfcryLDy2/+SK9a/NPwnLaHHgyFw5KC77vokf4PgIB0/Luh2sL9SsR
+jP5Xgduk2quTQA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICyTCCAbGgAwIBAgIUUbC4F7yPobFDd+B73iWKejQ3THkwDQYJKoZIhvcNAQEF
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxMDAxMDEwMDAwMDBaGA8yMDUwMDEwMTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICtTCCAZ2gAwIBAgIUJWQl8gkrLL7gPn47YYMdN7qBP5wwDQYJKoZIhvcNAQEF
 BQAwEzERMA8GA1UEAwwIaW50LXBvc3QwIhgPMjAxNjAxMDIwMDAwMDBaGA8yMDE3
 MDIwMTAwMDAwMFowEjEQMA4GA1UEAwwHZWUtcG9zdDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICtDCCAZygAwIBAgIUIVsTCuql4BDO2r4O5zePBEoHg3QwDQYJKoZIhvcNAQEF
 BQAwEjEQMA4GA1UEAwwHaW50LXByZTAiGA8yMDE2MDEwMTAwMDAwMFoYDzIwMTcw
 MjAxMDAwMDAwWjASMRAwDgYDVQQDDAdlZS1wb3N0MIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICszCCAZugAwIBAgIUOU+CyYnf3GRRgGHvbeJB8HTUvJ4wDQYJKoZIhvcNAQEF
 BQAwEjEQMA4GA1UEAwwHaW50LXByZTAiGA8yMDE1MDEwMTAwMDAwMFoYDzIwMTcw
 MjAxMDAwMDAwWjARMQ8wDQYDVQQDDAZlZS1wcmUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICzzCCAbegAwIBAgIUYQ6xulHM0FrQ0sKMdbPI2ecC3PcwDQYJKoZIhvcNAQEF
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjAxMDEwMDAwMDBaGA8yMDI2MDEwMTAw
 MDAwMFowEzERMA8GA1UEAwwIaW50LXBvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
 5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQ
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
+++ b/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
@@ -1,8 +1,9 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
 MIICzjCCAbagAwIBAgIUYW27TGzVOIbjpG1ADx7m7mZnrNQwDQYJKoZIhvcNAQEF
 BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxMDAxMDEwMDAwMDBaGA8yMDIwMDEwMTAw
 MDAwMFowEjEQMA4GA1UEAwwHaW50LXByZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIUG+a6rMTJci1FAazDE7nnEqy9NrswDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIIC0TCCAbmgAwIBAgIUdYVySsSYBjTdmK29cTyCAn3/yIQwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBExDzANBgNVBAMMBmNhLXJzYTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswDAYDVR0TBAUw
-AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKmFyq/NhjUrNK7r
-g6D2o7Pruwk7JWMo4qKbCqzXyTN0teq2jPTJUvnEFcN6IJpUT/f0CYw9/UoaZDLq
-OseU1rLlTSkKQKgilvQGHRcYivmSqHz0Cncbs+epHnJWyjb+DQ3xjWx3a0zdY3a4
-6GG/LPogDZ/UlWBpEe73wfvSPauOTKSDEWQgMrWuVMZOGEn9M/Hl7dkN6ghYXHgI
-U/EUti/TBwmYv4OQKJXLWk/n5vxPNfLIwzGY6frJncobUEtpnZ19ISPa1sHKA5Ge
-1spD6s5CWMWfpF8gIumdYOx5ORo9ikXqIL2jVC56Bw59GAVq7+zrSU71pm0MprY8
-hEw+zmg=
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAHm1XPjwohDVqRAN
+GMNY+m+fZRGlltXFJLrL4LLrHcXDd5DfwGWNETHQKmBBJ0ml/sAFKCOaxMR453oZ
+M95BAAUSAvHYOuxvbbA9ouROCiLhImVsAU0FGRl+aKsiXj2EELlZGvl36oodlJDo
+/SYVI725wTP6RtsHlq0HeSWO6czvCRdM5T6yD3xBeplqXLxoV2qggNljOdTKkpsk
+4GLbZR/fR+63ROpG6fsDCF4LPJpXUy6xxI9/KJ+Oro3TTpYwCQjCiQPKHejM/+kd
+RprZK1HjTy6efjOOIm9pLpr/nciIvEtLapgGZdF82/+V0OTlyJYilUnaasiMqkTd
+yma464U=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
@@ -1,11 +1,12 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIBjzCCARSgAwIBAgIUOfCpDDHRMHsrylfXT+YKqqjtbDEwCgYIKoZIzj0EAwIw
-FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAx
-OTAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGNhLXNlY3AzODRyMTB2MBAGByqGSM49
+MIIBjjCCARSgAwIBAgIUG4w/zQL4qp9jDNu9mRmC1Uw4z70wCgYIKoZIzj0EAwIw
+FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAy
+MDAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGNhLXNlY3AzODRyMTB2MBAGByqGSM49
 AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMt
 qM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC
 8Fr3Gh/dzIN0qm6pzqMdMBswDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwCgYI
-KoZIzj0EAwIDaQAwZgIxAO0GJz6haDpUtNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ
-1OxFRuhW515lVbeTqfcA8wIxAP7GVGkE0FW4Ne42d5c3VnY1MM1Ta2JelzYF1SjR
-gbAqdnaZmnRhK0Esx8v7/fBTaQ==
+KoZIzj0EAwIDaAAwZQIxAO0GJz6haDpUtNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ
+1OxFRuhW515lVbeTqfcA8wIwfUWaLzjOmCWB6WPzof1CLGZtghIgJ8gI9jpdp0ws
+vJBIrNutPFFYphQ+l3zrtkMk
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuTCCAaGgAwIBAgIUd+nYF5HA4RXbOE4SiukaJ73xk1owDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIICuTCCAaGgAwIBAgIURwImUqHILDJIFskP8H+JniATYzwwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBgxFjAUBgNVBAMMDWVlLXJzYS1kaXJlY3QwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
 0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKk
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZI
-hvcNAQELBQADggEBAGyW//qJiLakWoTeQiNi7JFRkw16+ysHf9PfTepN554lluRu
-3GMFJkhXILvq3O+P97yIRVCcxLEOPkq8igHwni6b6fLGpy4VXckzMCcjaZm63Mip
-0+ABwWbJObSrUUE43vlKHmlfqrOOaGzJ2Z/H8yTJ/jszmzENy0uONOdmrB+HLv0D
-8M0Dc6Ca5diqOujvZm96xjDvEEs6a9SrCqzRAL++WtghqO2w12KWFlwIGWPsvvDf
-J6/tSZ4mfSrHhNTVaZLcLNjh6b99zKvJHlhlUaP/5D/8n+J90bESRAgKlzjT9bvb
-V08jPRkkLjkbFfCWDRlFxBj1KANjnKUu9xiNbww=
+hvcNAQELBQADggEBAC+EPTZJhmtH8SY0xkqQp3j2FBhp043Z9LqjcHbSZSKcX3fd
+IzhlzmNBiB01P1LsOQYRDCGrewLFptl4z/gTBRod1E3SOuNC6smAsePGcOuufSFC
+uIGuA79scy5OICoLkNXEN+mlMHlGCCvazsZE7V49HmfN6qS1RtPC45IILuaB3rUm
+NWuv9rJ7PtDINZibvYB4ScjGZU8cNz3yrkv/2AoxpXV9TpCvGRTSMGoLO3vE8QWZ
+6MsPYlvYMLeFMvnwdwE2Kj5wlyJQIus59rp6OFKlgLIk7JFRkShSl66VFNbtCJhA
+ICk5G68lFne+Nl2pck8ZQ1J8u9K6dK3OLbw15F4=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUHQ8DERLjQHbdD8CuanShdy6HQJkwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHaW50LXJzYTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIwMTkw
+MIICszCCAZugAwIBAgIUQ0c7dkkQ0nQTbR2ggxXrRJSookwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHaW50LXJzYTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAw
 MjA1MDAwMDAwWjARMQ8wDQYDVQQDDAZlZS1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAC/Vu5c9Zn+eM09EcmZMnaGLruiFYgwl6gznMjuprjsYDtMSnLiyoks5
-UotNCwXmIeHFCuPkmAAOvPY5qHUzlyetKqRFskkwbXapbQ9rqqVos1D1MEjoNLjT
-Ed3ZV13zjP3EHyfft76MFwZkdsgoPQIPpZSUrVfR75mVGZ1itYUmMDbC10kH7wGr
-THeuazGo1InrcmHWDwffIQkb7kIOdBT9RPH4G5YJpBLGQQdAzft9oHTgED6Ehid0
-txMxXtCcJ3/HifZa2jNS7VyNdgRtNOB9PAUdDqtFm0aOsG6nKd6ijAHEW/Y0zJBi
-OHwpy/Gniu9upNqG9V41zcEfVFff6ms=
+BQADggEBAKcHT9duUtMkdu77y2uL82oveN8Am2E5idD/wZs/KirC/X6G/xlaEMHR
+f7zj9PF3h5gxLCvCCBwD1EZi9vr5W9ryvZqHEHlASKh7glv3OmjZyCr2x/eEhfmB
+A9/100gADVIaVPRT3lmigQMA8XmKpjNhwAm1qGlMM7GgAVw6sKqsQX9+2CrArsnb
+i1MhwJSyy179jkVRA2kWgGTvTPt2uWTm5Oj+YQvjQpNmMRbL5eBTLPxNn/UHZj7B
+DDiVrfyC51JW0xI6YcttFjaPmZBxpQQhoQBCbXxFc7BKtz9jKoMjWyuLqgTnnvnz
+evmFEoF1Ibq8Ky7QyvcV6B5qHa9L7LA=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
@@ -1,10 +1,11 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIBdjCB/KADAgECAhR3OIWBHZJdnr6i++ZU93SwTYC6kTAKBggqhkjOPQQDAjAX
-MRUwEwYDVQQDDAxjYS1zZWNwMzg0cjEwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5
+MIIBdTCB/KADAgECAhQB171JCj+xSGYa05CyEG0qnSWXAzAKBggqhkjOPQQDAjAX
+MRUwEwYDVQQDDAxjYS1zZWNwMzg0cjEwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIw
 MDIwNTAwMDAwMFowHjEcMBoGA1UEAwwTZWUtc2VjcDM4NHIxLWRpcmVjdDB2MBAG
 ByqGSM49AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22CO
 JS3ktxMtqM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXED
-viiIz/AC8Fr3Gh/dzIN0qm6pzjAKBggqhkjOPQQDAgNpADBmAjEA7QYnPqFoOlS0
-2BpDdIRIljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjEAzFFE5+nV
-AodOs5ppud3gzbcLL/WkH2Q2g/QYSyFVGHrFeGKHgHuVDucLs8Ict1gO
+viiIz/AC8Fr3Gh/dzIN0qm6pzjAKBggqhkjOPQQDAgNoADBlAjEA7QYnPqFoOlS0
+2BpDdIRIljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjBDM9F1oI1w
+oM+7MhWKBGJYMEbFTjwgGU4cYR27/ws1kQJrYYjk98KbUjo21Yql2LU=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
@@ -1,10 +1,11 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIBcDCB9qADAgECAhRfkqnllnFUGmpix9XkwjNOpu+OhDAKBggqhkjOPQQDAjAY
-MRYwFAYDVQQDDA1pbnQtc2VjcDM4NHIxMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAx
-OTAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXNlY3AzODRyMTB2MBAGByqGSM49
+MIIBcDCB9qADAgECAhRVnNPMsOIeuMKvH5nCvRqbLJumcDAKBggqhkjOPQQDAjAY
+MRYwFAYDVQQDDA1pbnQtc2VjcDM4NHIxMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAy
+MDAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXNlY3AzODRyMTB2MBAGByqGSM49
 AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMt
 qM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC
 8Fr3Gh/dzIN0qm6pzjAKBggqhkjOPQQDAgNpADBmAjEA7QYnPqFoOlS02BpDdIRI
-ljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjEA4tdKjU0TvCEQpjRH
-Zp5fHyrNRi6uW+UoGhsRYSkfU+jOm2dT4vBoo8zY1iBeFeM8
+ljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjEA/+NPEcjoI19ZiGEY
+5W3pzAWWYe9QZKu+IST6F22ccd+v+Ww+5ll42vz/EPKsuzTB
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0jCCAbqgAwIBAgIUXffRwHMZzosCRlTxLtkXSS+V2zAwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIIC0jCCAbqgAwIBAgIUL1EXwGvVW9BoO1/xB7e5p5LwIbAwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBIxEDAOBgNVBAMMB2ludC1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQF
-MAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCg3jgfrZgyvm0V
-L21zRNlIfC1M03FFbnqmZpD63t8FB3RmxxuX/78tuLeg9HMYydY4ZhVYyvnG5wIB
-lEGaxWHrdNcZhUhD1I6YKfB68RiqN+Fiwbi/ISBC+DWEdTwDAO+Tg32r8MeZKggD
-y3pa8wSa3P+NBavSC5P6AfvtjY5RJm33W4vAw2Eupn6Ym+62+Ab3GCWzDDBaUydw
-3my9OPGMylx3hhgjORMuKxuz3Dsb7I5axiSIfHnVO75oMu5QyTwzVKDrsvciH+FS
-DxwWcnYtaNIZMcMbHnPiL9YBeG8s3yV0AV0b1q4VaXTzOgGY9Bmq4QfGsJ7WxZhY
-sW8D8ogb
+MAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCZ7X4YXIsBQcw9
+UasDIB3bJBucSj8RElihNGARwE+dq+nPAroQNVLzEUHFigsKXlcdTjma2SXheuwK
+jmbctcpeSRg99y5UJf8CqtXDeD3+siRqqCtDrktTrFgmMZWBVc6YohY9WASybSMO
+mbM/oV3hAR8mQ2OarinZqttZ8h4LFTVDC3iktsnCS8buUKpmJRlx1n91GUpG76Bs
+tU5SnC0zmpTtAw8fkRxY7+J+n0OCybcSQUzhkw/jcon+5qVOBA1W5+GJpH3OYIsw
+JYGPW5PQhCgCEw6kfXpQbPnA9LyF5+Ec0GZp7P8nLKAJUXXUplrhj6Y6vyb3Fmbx
+QF2VXO/7
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
+++ b/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
@@ -1,11 +1,12 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIBjzCCARWgAwIBAgIUW4GllUbL7Q0oieKMjCWljENsBvkwCgYIKoZIzj0EAwIw
-FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAx
-OTAyMDUwMDAwMDBaMBgxFjAUBgNVBAMMDWludC1zZWNwMzg0cjEwdjAQBgcqhkjO
+MIIBjzCCARWgAwIBAgIUUx/0v7GBIwboqJV2VB62Kupm1kgwCgYIKoZIzj0EAwIw
+FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAy
+MDAyMDUwMDAwMDBaMBgxFjAUBgNVBAMMDWludC1zZWNwMzg0cjEwdjAQBgcqhkjO
 PQIBBgUrgQQAIgNiAAShaHJDNitcexiJ83kVRhWhxz+0je6GPgIpFdtgjiUt5LcT
 LajOmOgxU05qnAwLCcjWOa3oMgbluoE0c6EfozDgXajJbkOD/ieHPalxA74oiM/w
 AvBa9xof3cyDdKpuqc6jHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoG
 CCqGSM49BAMCA2gAMGUCMQDtBic+oWg6VLTYGkN0hEiWPOY+voEXA+zXPXLwolQG
-WdTsRUboVudeZVW3k6n3APMCMFB6KULwMHskNVyDBpa/dGsJmmfrjOmCQXUoJgOO
-YO50rFG7kOAIZsPu87zEb5hLYQ==
+WdTsRUboVudeZVW3k6n3APMCMCAGl4cklcPnqSYue8IMbF43LKiifzZPEJG8NcjZ
+VROgqJzOU7sUP8Q6bSGrmNu/4Q==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUUWOwyj16EyppwNjhm/JvdM3jghEwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyTCCAbGgAwIBAgIUNTuVvevwwd6A0QS2YWx7PHgEXScwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCcPH5N9BPOQrFOFCsw++lFly+p
-cH4A1ejRfyDVJXyms8JKk/37oLmU5vc7QZJx6LIKnAORgI0wAGJEQetU5W8X5qpU
-19QmbvqJW6AfQDZlUZiaueXMbQxFfEuggDU+UxhC4LrhSFjW5EsDnHeOfPEcu6Gt
-tbYFTAyAJjPNVBIMEyplFavU2HAe/h3HJYu8VnqNheCehtLRDMtbtG3+nvIM02Dy
-pHtlA+7o1c4HfzOsCp4uogsSgw8EprduyJlt/aokn5HDb96G+dWFW9dCR6G36uKr
-vtOSaYkyI7HM7CKLSiMHmJa25UY2dVTR1TgDJLYPSnR2Oo0wPD0+uY+h4K0+
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCijLEmbTVmhXTCfzGFf0b6bHA6
+u3HMrE8vKEe6oewR99UlP51su+hJd6/VWDmyNtvsM6tbrGXlWRXSFYbxpKKNA0yF
+XaPbGJBfqcrFO2gURo2pksbWnUkPBbV54PJpc3lRZe3Ttg9BOMWjRV1idwtn0b5s
+prTrg0iqm+Wt2L/dRLqPtbNfqg4bJiEOHCzZejbcZEisKUWhQaAaluORtnB9H/0L
+iaS9hdlBNFPWnwlQm7gr0fJRR8sDy1DG3/9YWpMkhIGtnv+zsM/VPlNR4NylbUJw
+yVBuuIc53ScbH7wBRkrRc73enauDWyisCUp/WNfsVVyJg/exS1rW6l2FxP0O
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
+++ b/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUWfHtESyYqzQj2CcFPkOoNIDwlHYwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUw
+MIIC4jCCAcqgAwIBAgIUI4hQjofv/2qvMHcGG2PlMQ+328MwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUw
 MDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
 a2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8Xg
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozUwMzAxBgNVHSUEKjAoBggrBgEF
 BQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEBggrBgEFBQcDAzANBgkqhkiG9w0BAQsF
-AAOCAQEAOaQWJ3u7lMW5okhLvzbWwXeI5DlSpzBm0vjmW6zBD+pwRCrOzV+TeKnN
-AIoF8g4fJSq0ep3IFINmLqzKKc93XrQTB5FfKs9ZYurpRSfCD+yMPVlc7mkb7yvk
-/2bt6pnBOys43W+dRPlLxY9uPBMl4vYxOOh90Qngr0XaKoMFT/7RPSfdWTBFNsmt
-3tRE8okCqpXjo/1mGzmG6cGCSE/lrukpo48BPxvd29Ju0y4+rQbDI1xiHWKimgUJ
-B+tHGFk4RLq3uVihXVEcKqW2H3m72qjpCljt/fnNZZdTRGreV78WUDhqKxKIgttT
-PU25POqvbL3HwWsscsCwCB08lDGVFw==
+AAOCAQEAqwwo+PpfcvZT+B5DRPGP9vssFbY7xeKMu2ZZIirYwqMen6Py2Yx5CES4
+g+VC6fwZPMFjZ5KlsRqD7miDUnvHcOxRlCFVswNC2H54mvbaVWrkQznJeoYXxV8n
+lzslglPOzSeAEHyERJukNyDDTfZDUyUwaCWFUo/C7GGw/xjgEhVjf1HuCAEbHoOb
+21qBrTcmwQfLMRM8sf9HHHgl6Ng4lDNl+WK4XyG5hJxLYgclAHJvLDRbUib1c3uO
+EzQHP6EeEWtM6x3yvVZeMAFlYfcYkVyOqaryW+FQSfMTRrY3sszq056c/rIjAQjV
+c4UmHrGXI7RwZnycDa7spKWB4NzGPA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_trust/int.pem
+++ b/security/manager/ssl/tests/unit/test_cert_trust/int.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIUTS9BHHwv7mbGYr1g/GCSrK9pLmMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyjCCAbKgAwIBAgIUS6XypzU/bkZInxeykZUlcXncBDQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDjEMMAoGA1UEAwwDaW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
 a2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8Xg
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsG
-A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAZpEQtY8SY9eBeFjdDqUTSj07
-MWBBgfI1FHFu/W225I2cJ4aPZAdq2bbO8B6FL5qbyWwDI+7XoclcfakMJbEQC+im
-X1LcgCpR+GmuXsdF5neWzT6XqWCR0P3VLWrPBpOD0ZhkN37Q5y7hl2IQAms0Fuaz
-AjA7FEpgzMKwaINmxCYqldbGYfIAa7+jC1mXO9p8wG7fWpvuAFO73ee/NWzW/VaG
-77Di8JOZI0FvHpr+IyPOt1+muj4Zc1rWczsLPQ2QPX0RoD3VqOA5lh7r9/PrJrnO
-HuUd1mA4sP7tz8PJASlTIZ+bYlpL5hNopLvYqEKsTteGtSSsJwqPqgKgTf3a9Q==
+A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAbhCC3CmHws2DHO+8r9KVDMB/
+deBBBc/1/AvrWrBPhmQfZlkm/l317siYNLGzKHLwTFNv7AbGART2QZyEmKDnkWyC
+kK8OpIn762oa9pZ/CtSKSDn12ge8w6k+onR2v7nzPj4WDHCn/i2zj80rjIDxEoDh
+QV3D7xFX3R0YdmJwcsylzoIGLerA2LxRzHpr43K+vXsBKtWGDy3Ewn0LIgNO/dIu
+XD7G6ODW4GXL7ZkUu3MSvO1htFwp3LF0b8TlZ63Nu0K4+09y1+JhXjGGlIH+vy/D
+EGBiBR3p7iPPj1Pp0B1QmgzppAslXeXoJSIbs59+/VEZ06ssaBdAoWMSSPa6+g==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem
+++ b/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem
@@ -1,24 +1,25 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIUI3hIT6C3aep3bBYeGkq34MtwHEswDQYJKoZIhvcNAQEL
+MIID7zCCAtegAwIBAgIUG8VVSfae89oILxsCPtmAUiWnfAcwDQYJKoZIhvcNAQEL
 BQAwfDEcMBoGA1UECgwTSVNTVUVSIE8gUkVQTEFDRSBNRTEdMBsGA1UECwwUSVNT
 VUVSIE9VIFJFUExBQ0UgTUUxHTAbBgNVBAMMFElTU1VFUiBDTiBSRVBMQUNFIE1F
-MR4wHAYDVQQHDBVBTFdBWVMgTUFLRSBNRSBVTklRVUUwIhgPMjAxNjExMjcwMDAw
-MDBaGA8yMDE5MDIwNTAwMDAwMFowgY8xHTAbBgNVBAoMFFNVQkpFQ1QgTyBSRVBM
+MR4wHAYDVQQHDBVBTFdBWVMgTUFLRSBNRSBVTklRVUUwIhgPMjAxNzExMjcwMDAw
+MDBaGA8yMDIwMDIwNTAwMDAwMFowgY8xHTAbBgNVBAoMFFNVQkpFQ1QgTyBSRVBM
 QUNFIE1FMR4wHAYDVQQLDBVTVUJKRUNUIE9VIFJFUExBQ0UgTUUxHjAcBgNVBAMM
 FVNVQkpFQ1QgQ04gUkVQTEFDRSBNRTEuMCwGCSqGSIb3DQEJARYfU1VCSkVDVCBF
 TUFJTEFERFJFU1MgUkVQTEFDRSBNRTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72x
 nAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lM
 wmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF
 4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNRME8wTQYDVR0RBEYwRIIeU1VC
 SkVDVCBBTFQgRE5TTkFNRSBSRVBMQUNFIE1FgSJTVUJKRUNUIEFMVCBSRkM4MjJA
-TkFNRSBSRVBMQUNFIE1FMA0GCSqGSIb3DQEBCwUAA4IBAQBdamlx/6oYDTbf06KN
-6tiBVCtf5GloczF8q+nfLMx90KICCeOLwNLD+Czm8vpImcMMDX2xEGM6aVZ+AGr+
-4Ez004u/WxfIWTIxF5hrlvH7UC3TukQetZzw6xjypbRzTlN74U0cqKmcBQAC7+6P
-sx+mWWajv0zSvMiz8XWf5Da7qFNYNqP6msdiaPRiS4ng6OADCeA3ntKTjpMH6cdB
-nDuCs9FsLwi5DR5/eYcpe8b/tZPHtkNZqZM7etb7tc8klYRcRAxdCKAR3d3W3Ay9
-OlDGqd6uv6oQLsm0eeZM5Udm9X+RjK2b51Fz00WED3RZ10IA6Hy41ucTfoMJLjEw
-dBD8
+TkFNRSBSRVBMQUNFIE1FMA0GCSqGSIb3DQEBCwUAA4IBAQADznuQPvzlPb91dqO6
+jL5ezSFuDVcliLQRI5XjAZTkSOzqw4/WIK/ijGooiej074W8oUWK9BwYzPLcgNfr
+nL+DsVWgcqxvEO134biPSNc6IAX+pwE8tyhl7B0n+VKVZP+9hweI1vaugvs2iWSq
+hPOeC/4PYljVhD1v8hOIVuZEcJaHG57JRT7d7+U43mUarVL+bzOZlriLm+Z0DhyW
+DZAgCHelTRQOrmEUj8z0sv+UICnd16zX4a6QeM+UaTWbYExQ+jlCLC2M2ziKtQEb
+zMUbcRukf263GRGqSWoQo41BNa17GZFzvZFyBdfNLjNidjVvtE4fESROH72gl3ob
+/KTs
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUEeVKQD5uXJ2rC7JY0S72ZhH01tMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICyTCCAbGgAwIBAgIUdcssoeZHtQo4UQT3aWS4yq7hOMYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAsGA1UdDwQEAwIBBjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCp8NqiG59RXy8O7yJjzt3rw+gd
-J1RuuTzUD+ZpX1guZtr1dYBTHB5X9Q9JzIgqU8mCFWTBTYqpHG6TGnZMphyi6xV1
-yefRpAFmqT5fm7yY0hc6xtSKsRRKx+PbjqIu73qVi6k2/jwo4gD2zvHQnuvMt05o
-DIxEFBKZlk0e/ezzG4stXdg5h2Klbp/1CiRs9r2wI25r1kxnOF452/HTC8gW/9Kp
-Q6PwFGbKT77c9O1YTiTk6r1cQlHGRi2ag1QxWaBmmS70eLda8AzRdg4y/GVZvBjC
-SXipiCfKMgz4lfJ2MrhzEpqHfbKXhAyNz1IujPwqXOXwPxuLPi6N/aosEHDn
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBnmwQ45LUlEbpI/Q5ey1/iOgQV
+Mb4KhlaUvg7yEAgGtGfQ5Za3xfUCcCdPPP9xE0qmMP03K+Nb+ZtBgsi9yZ3HyXAR
+disNtlRrrJFul+nMBcdPLk37uUx0+iJb4iHm3L2AuLWMgoAAl9eXN39pIkNRmmro
+CX08mKcyHT1BrgMPUO23q4BL40Fe8bmrWQmSCI9R9pTRBOhdajtz1a3oB3sRR0hk
+TVXT0kkT4KlJe2U3KYaw7qeLE8uAtS/92Dj+y9uFJqq7ci2bea27G0yc0+kycHkV
+lHvwNtI+Zv73wzFLddP86lEpmGtjQT0+VT2kWKAka9HcAfyY2vKQ8Gx17B7f
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwDCCAagCFAVV/G/rYIWXK8hIMM1mnLDSE+H7MA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICwDCCAagCFC+NRfY048KXZvvXcyoK39ACgAE/MA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBYxFDASBgNVBAMMC2VlLXYxLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBCwUAA4IBAQC5ZuzDdt4zJI3thz8uCjMYRisEQ0bhbxF2581U
-xc7uW6Bx4ncdLZL8Df48PcWAqOAbwFUL970Zxn+a1TxVNK9RKwuVNOSJ6B+8ogZz
-62zAtBA5uOXjqnuUviM80N9W7mNUrGEqNO8J15ZMBCumc0wJ/Z1/FuO1l9I0kDv+
-/QMbZAWMRIKkatbpw1du+5X4sjq3NRSyJPsY9PE8lr9xXPxyd6nYVmfJ9K7YMwbl
-YQzSNyHZkiEkcita8PadLf75jB8eT3b/V1TvJm5wG1vja4qLGLKeohgMV6SSij2I
-phIHct5bJxvkf9UEjHv7MMVzt8Q0PPOM8IqUN8ooDXoRwtJT
+MA0GCSqGSIb3DQEBCwUAA4IBAQANunnqyOe4s0IdxD3QT5rEAEFZChf7XJl+E+LZ
+GFX6cP8fdvugts+NvAC41dHkKHxQvrq1Dh8cLuIXM4sOduh7tYw6cZSfP60wW/Hu
+WfcLM4sJUX5DYnQG4W1xoqRDrCZ2WcBGxXITNNQUvTHtnQHUKXncniT5AleRs+XY
+2VRVqr3kk8F4fDtNm9zaMoPZ4jN+a68QeIh5w8F+N5Ljo73K1Dtisv2P0hu5fuAA
+EX38W37jfl4KPkFLpo5g01ebOcsY9IkFG3IkMrAQjOrS/QG6ORrKuLRkYdwBUauR
+l+GIrGKuIpWaXqbm5LSV+ubqpGY+Yz9svkOz2Z+rzNrZXvEg
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICwTCCAakCFAvcVkpKQfDDnSLlVupNoziOr2fFMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICwTCCAakCFEvouhBOKLkeLfJSG83jC3EKdaNmMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBoxGDAWBgNVBAMMD2VlLXYxLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMNMAswCQYDVR0TBAIw
-ADANBgkqhkiG9w0BAQsFAAOCAQEAaa/VyGyhUTz+nqcr6blT3L3RZZtLBCHrzsBp
-uTiGqlcvygM6NgGm0XTzf2QIX/kn4jez0QAuiVXQYIuY3Xie2JIeTmfX/9oNCmlb
-i0v13FxqEzM6tBDTnnjib7tF2ExyT2tjfwyJzBRCL0gBnjaJoNTX9+MX4NmPoxdv
-0QbJD6wk8A+o5jsYgj14IJFeqey6VHZ1yJIT4GI6Xp7LTdDpUz8WWQ94Z/Zns5ty
-vJzGNP6drC2Pz6nw7TQsuTgZqTCJ9e/Iy0TmO1urpiUPkiA8Kd44mZrYrQ6W/uNY
-Ssm/BtI9XCFs+5VW7ZqDD0uzcmvRcL5igHV+1DkbGKJQaXRqpw==
+ADANBgkqhkiG9w0BAQsFAAOCAQEAB2+puZ/c9HltFqWCwiIWuzQa1Uejoj0EZQNS
+hTQ/EY+mKP3VDqv3ehOwFm09qrSmZF23ycOEoLrpfJIanrzvWytsA82AVa8K2rMt
+3n7637TE2fH2nKbHLiB7Bw2l2+AzgtaLcyvXC8j3FhPjKCiVXNsMwkWRk9Yt8+9A
+8gUYmbHiuqmqK5S83NawLCzJ9qpuo9KXQgtjpCMyRoy1MXODxuOIRBClglG8AOGn
+H4fQmOD7QQVnit99oqHpz2jQ0KGVngvqojpZuLEYixXMir/ndMPX5tDANdo5gfs6
+/mmJgMsR6oTqTtz/IESrP7o9ix7qehXOMhjKbPIYHBycL2cDYQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICrTCCAZUCFAvxfrpT9xe9C19Kelw46E8U2gmsMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICrTCCAZUCFH/+i621ijMDTN4djWjBeztSwwXsMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBUxEzARBgNVBAMMCmVlLXYxLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
 TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEB
-AHnNQeQRe8uZFdiSnIOTn5A+N7MD2+HIU10cpxZGV1rkwQSmMhGUF9Nsr6eF0EWY
-Ii5QgE0lOrlYUezp0UtIGCOnEU1MX3ykqm6dXBbff747nFrn0ehtt/4KElJgax1t
-HrQOH8pZ6YLcW6F8jB0dQPhQbykufPQ7d4UVwGxs6hvci8/c3JDc59lbG0YqUdYJ
-Zvi1AYi1IC2M9Rlwhz8DuNzRrbiQi7wSIDyvBl0EOJQ/2kTouXQYd6szppnsSj7r
-4bqhW6ygI8ypRCQdXwXo62Z36JAnEv1pca6dxNbvQGVDeXpJsfg8Rw4AdmwLH7kz
-UBxDOPJ9nDLWP+8iul3dXEU=
+ABCwtmnTwWMkK48ej3epAw4At51vaioylE/7B2v7dWIDJgkX9ZgQYsVCQfXroai/
+evCjyYXyeGndxpoU7ybrCxWTvnJsQNXqKktQxhYucha3/l5FmN39maXMJwI+/fwm
+76hbOvubOfQNf9hLmkOYFo7jdFdPnmBNtbqBkdSdibK3b3+k9LzIB/dYKDqEPOy6
+nNiYy6VjJlZV6sBKvcbPsCcWsJbzt0jtqnd4IXQ6djbYy1swSzfBM5YE2Rgd7bGM
+YkyjBY7xdYyJ8FGNNE8cIDlCA/9sLhHz/EevcBkS8U8V4xe8rwcifFxyrrAO8mBh
+zwxLDOMYfT6ucRJhpf1SACw=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAQIUBdGn60fk5Wx9/s/U3Agpy/fpjFMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxTCCAa2gAwIBAQIUOWEBJ303iA3IeYgeXncFi4UrZwcwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjItQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFxKRGej5lb2mTLfe9Y/Gx42xK2rhbwU
-Nq3EHc/M/hVwGoTBahQD/L2Qfibjp+jjM/X4/ftVmvV78pd5mi0vR1SNriDpEYBy
-eM1G+Iqmf6zPeYo/mI7iZS6wtgQzZAoPDAd6AgL2b9xmRHkA+33Nx9drg4GSHmd3
-z9D5jc+RClf33y0R3J0XhCoVKWXLXOCNPsrJqn9dOaJt8trhlICF3pCTeSgZG9bX
-+rfD1VQFMPPDPkzEyKiwMi1SnQncGs4cHkpeQDWwYd72du6cqmMTrR1oLRc5er3p
-bjl8ofTRq4qhza7oBxErexxBmnm3xBhLzEhNXjDZRpPwcgCB3MxZK0I=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJXJPeyjmjEy+izTfRQ25OqJxLLjkjok
+CtF7gwujmSfDiDVEczPGaMM879BHk6EbHkut4Ynh5IadhzXzVhOVnIDkUZYMJYc+
+dXqn0RKj9seB8yZwKLQ1i26eHKvSLXWu50IggTXug2YR275HmW8vHNYuqythuOcu
+jYOTZsDeofBgYRkOBzmQ4htMwkMX4hW35+1BZbW1q07MUWExwwHYGvz2LvPjJ2kc
+AsrGxjmZSX6UTSfxeDL3k0eshuDRMvOzMFK3W1m6ZX3mcUK+h3P0eSE60wjIsiZH
+iVGvrhzYRH9oOdtG80RkMBQJeDee/SkgJ/3RFsuSVb2e3FsigT3WOIs=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAQIUddsBBAIuF+3JL8/ElbRw+juHnREwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAQIUYSaK6Zbk1iYw1kiWFXMldvNIhKkwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjItQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBYVlDcZlorbAJN1kkL/c3G0Y9/w6Lh
-8Wcz+noGVnQYjo9DUCs+WGKbJ7THJao8Oy+h3YbbhHtt7lz/2XACPE2rnvgr5b1x
-nPBecAh+Vj+wznj7vQ/yO3KO6JlQcuriNFbfGdgmAZDjycnlXh5GWzrHyd+Skw/9
-Sxru9VkhXvGWzW8ewW8j3swErsfHvgu5TMigxC4GGhqiheWydQy7JQoM/B9jiyrJ
-jTwLVAHRjAShfK5DQTsLB1oIwRnmdQ9To9Kry0yqan+p2Ciq5iW77Lg461Ksg8Da
-VLrVO2EbCDmlZlXwDZMWrSbVIRcf+Uk4GXC5jCu/g71K/9/7eBlnfGut
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBPL12W8Jcs0wHqufSh+/hAdeVSr/Pr
+2ZpGEw2AxcpcqLbTYYonvcboELrSsSyJdvRYesG378aYyY3n/uf4jcyTHP//Jd9A
+tm9lTvIgCunPxR1h7Oalw/aI86Keu9pWAFRMfrcw0OzSJa37Mko7qCfjOKQByhU3
+sarTCXnVQq7x7WB77sDtGzCUslWxsYUNYZf9C4bcxS2ZPabw7p8k0uqegHqCzRnV
+Kg23oQxcYTwzWK503LMBuSy/luasRKl+Kg/r3/j80cZ6H3Ti59HP8v0FJgNQkhtv
+LeeDNaURBnzHghrVaRaX2hnwWqpWybRumD+fnac6seDLPwniOOg9uQw7
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAQIUUfhEofH7k45/VinMskelLHyeth4wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICsjCCAZqgAwIBAQIUbzMJDdRsUHrxqztYv/lMuvRThPowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjItbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAUapBZ3df6YLcpaR23lRhMLWuAyg6y6VmEt+ULdGFvKXJqpT7DGUxsI66
-X1czhGoEOJAkRacoGwXFG9sk5g7wv5oy0LcmfYuo8NNjXV2BwRwcZPOohGGBQdLo
-AUQYb4XtOF36MSdfE54WiARfp8mOuGV0LLjHgh0uszxjnThrIiaxU97xPd2ccRlK
-HSSZmhYzlIPZbIIxsc3fLw9xAdzDQemeIM9fw2ckY4AKptvs/IspPqsa+IWJ+Q/y
-dIP45MFFggQI+wCsU/osbUtv6lAFpJaQ6afVv+LPjlPdI8/sEhXxtkIFEAnM/p0F
-ZXexj4PND/kL6SGWxU1zFsSYYkCADA==
+AAOCAQEAYn/YOlxl5AsgcZqDqXilYD9Xxrk6QjCTdn0KvTOx0zXxDLC6sUE4xjhg
+t4M+g3ZKcOSl5XMnx+rnzhxLJVcFB/w85CRR2TPc0+qPK43dlNRDSjjgRA5UByed
+gZnJNP7hVaVNlV0NX+96WakIZjfuWdlIAYa57651bYsGtQfkTQ5VOxx+TewrPRHf
+5lq704MNKKB/+dJFFpOED9tIvOdsffPuoeEh+63e/U+ZWMiPar/sGuknP40F5pEQ
+eAByWSDvb1sVio/nxNDwiOBgngdhNlHLpmLbjYdrG225mIprOXA0rC4Y5xPmgAec
+dnJWTIjIgnKEJMJqbVyikNmYWDlkqQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAgIUBz61UVqcbFcwVtlDgGpNjpcWLlowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxTCCAa2gAwIBAgIUEYGgfTRLpWb/Bcx8zsxw+YGCtaIwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjMtQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHGp4oW7xw2m00YGgQ/MnkD9oEbzDytK
-GGjuWPKDG2hVD3QwFAyS8datmA+Q+zdvI9scIJ9p01EPwEycXhLnMEzhg/ACBKoy
-zhpGPO+8qSO8eA2CkBQqm4LSh+Qk+S5Nzj2uUxqEzJahzb3vaqsahgcziq00TwOu
-NYGqU3KKIQXfrk7yta3ZjrWWst9Ys/FDQOuRlSsA3SqA9rZ+rXYcxPtTlMXanEQv
-vbGdYhYIXuMOOjprxVe9+1g8BBaUhzqTBBEccxhXR6dzvN7WNGQy/vCcN0DzKjO+
-inKOG2N9cC8ceDdE7nnHX+yaTSaIchrDjiOGQ+4GwrgmZnWxIGXH5Ak=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAItmFo20bznBSRIGit2N+zMyBPTved0C
+g7DMpZT5/JdmNAZzhsNPiyJhyfQOlc9by2mTjLqqAuv2o26igHgD8K9w2LEiJNCG
+Pmu5czmRAfSCucTvMDowZtfzuxRm7E+osdBZRvwxHStzxqpa5RPBdCoDoTV51N3O
+d4OuJxrGRpctmrYHh8sGD1AvP9vrb0uLEqNx9zMbl9OWuSQ++phKl56oJ/ECK7KC
+oybkCfpQZ0XoKX50wMCXeV1Yw8j5eJb9TGnaZFq6tyqgM0wgYJfTgzMc2EV9J47r
+mUV2lH6gpUoU+6V/U+HB1WG0qbpbXUB6Y1+ECGbe4oqJM0WAzxfOfjY=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUW9BCPVIIT4H2KeZnK1ujEQK/qOEwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAgIUM1XoxwbEvR2knayvwugs3GbpXHwwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjMtQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBT8TBbEPsZ7mTERFLyQt4zn2Nt//E1
-2qcjuUzTwuf83wOT4hOxSkXRHzyqsPPlT/l2ys9Ybnh7mAFpb2F9pYYzra4i9+M+
-mQkXoL712YGdNOEjP9TAUkip8bVej0paBXCcFG/vFHwXZr2PnB7YMu6RW0Wl2M2a
-56DKtQN5c61mK5nXi18yebgcuO7H4ea2Me9AoAEum+Pi9gCMVa+2r4H4ftfV/xsM
-zopRDLl3iq2ozZhyC2kWGRydatj7U9YU7NOsgT47k/l3SM8xfUTyB5IcA0ex16Ao
-c8CAfQrxRS4aDecAU2rtVNyZXXhFdRjMER8aJQkbXDdQk6J7VQRSrTiG
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCcBERc4XAajd63CZcJ1I01dcE+1+2y
+L2rtCfpUH+sQd1eKFDRWGjf5eouOHv2P4TgHBFbeoqXxHXRSWkaFS4mlfPS8fPX+
+QiSMzS0B0ielgvT+xDqUzVGtO/5bLfE8GCTMORT0iCJYMhNiHKDVuPzBcSpLAa2R
+xmudx1Rjghxx6N2fAPTMnmnQpyv5jE+SC/y7MBrzlZaXBlfXRwbjcHYSy/izOs++
+2aMXepsxqZaEfVs5dKD3MqfM+x0+CDzaCVeyH/HQ5IyhgBzP+Fs1Wk9zck0Xgpmj
+9DoLxeOQYUnvVaefvBUT+w1Q57wITFZCg26CEgH5KOC6y3izE0sWYTfe
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAgIUdcIIgQGSLilRIyK/l+qpmZzoriowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICsjCCAZqgAwIBAgIUG3djP0f/UmISjwaH4FRL1TRTyIgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjMtbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAogY8WpajwXdEV8k5Ti6WtFxiVKeO5QgpWIaSzgpylcgIkaTwApma9ezl
-vW9nn6f5XGW79sqzP+Kpwjgk+1v0T4IXfQIt/t5gKui2GRYPudYWQm2JdSjlUVuo
-4JP5tubtBCDiVWOtu8CPAbo+2Jg63lPVRyqGPbFVpXzQXmzGo/F022mrJA+6wumu
-C2a6qmgxEaIxuOtmeHs6Qk99qyTHrE/4i9EnyZgYe1QmJH22fPcIfy+NVT7pvasi
-cLk91c5QQUVTarjsW88KG6veOSYGLggLqyzeaVsZeLLdAoRjeb9BxKFWJnd1/0pS
-tZvNoGHHu3VlId2CsYNIC/C3okb1iQ==
+AAOCAQEAJUALpxJ9K/pLA4i5g9Aazm+VCvwBxaz+9Y/2/MSViJTh55Mw6D3h7WtT
+9VuKakpvGL07t5fIlj78Rt1kraA37hxeR2lWneD1Rmp79A3AMGJAFE7nABTD3Po6
+2Sb5p3/BkW8WPFVz9lzv2Nli2TQA4QRlOGTsTvLPwACgEstHdZprID5kgx2nv4a6
+9ltkWzGiePRFsinHYNB89+cMnQhZSMxmRcTyboibON5GTIK9e4FMZ+/XCbQFOMfV
+hIuF85YydjAvqY8sVf6cEzAohrlsFEgSGB9xOGGKjhjmPRiRPXDMlTssC2EwC8bf
+lMT9PSNUeteKphrK7BasmGqWIZxigA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAwIUJT+RvDm0O+JIR6OhEgquQ4SIpaUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxTCCAa2gAwIBAwIUZ/9LhQ82qzfSqBK68KBuMBAzDXgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjQtQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFcyp/eyZTOcVLwXo3t+2Ze0yc8bQ0EX
-QWjH79XkZnEam+ZnRYM6dq0lUf6Dy+5HpDr6CY5hftqeymmPvh1HptxRh7cKNB/K
-6yUksUwhug1iniEGXTttfLRE4IZ71DAtoM+83Q4x7Ju+lW0J+4Sg3F4Ivc5mbbBu
-4eqkDqU9+hgxVgfpscGVOYoueN4NksqdKvNDeXYl3E8AUKcAx/ETg56FyUKtzzSs
-oZQdKRgQtFTLqufMeBnMSzmquVfTrRTN+CpB2GCeTvhvktklmFvixDn4JHGO54zG
-MkaamMiwFLqgQZspMeFw/lTklPr+jGCyHskQ5ILq7hsI/9I6jojfSIA=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBACFtOyUwc9SsidQJXfeqGFJjvtWH6M7t
+GhRFhbitl6HwdkgYZbyPtVCHTwbcN3T4BsIJw8VJkO3aqUcToYDwy3ui2woG3aRv
+vNVdHO0dicZWbv/Hg8wt/DmnXnQXF4JcKChQRejDPHkMlol6ThLptbIP1xtcUlho
+Du827rVkQg06EA5g7LBogd0X6iTYKzlFQAzxZljafqfx4F+Ptfad+sNL+Aoc16IL
+nhVTtkAOgNwfMYLLGqOpWrxH29CMLSfdorrYD39wEPa5RmaNO8Cy8bC2qRZ/ZX1x
+350FngsYNnLWSGuNr1g9JTMmDcNegxiGBqj4UUUGz0My7JEQmDrj+TE=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAwIUHa7aO9opsmT3YXyj0Pi6F+jgXbUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxjCCAa6gAwIBAwIUcXq2t63N4Qar5CZKO+zx9dwF3PYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjQtQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAZiJzVOQV9GJ9va7rBbtzSMZQPmwUQ
-QrJ7xFVx2GYctrCeJbsCahuRemrqm97IEPcLbi8OU/6Nn1q1a+w/rvTYu+Cq3Cra
-2O23mqLbxJTnFZEuR2Eww8wf2Wz2NG0h6dRTdWtDpmg4Ia1dSBzfl39LkBQ93DCK
-rO2nS/GPZgdP/D1FAZ/As+uFUaAqC1fJ2KHGtkHul12Z0pkxtJ3fsMCOpPAJKIXg
-pL7DKphGqBTgYvF3xHxwPlIdzbGnTO+MKBs4MaaAuXF/t6FrnSDlEfzFSPfSDG57
-AivollZCNP+286zkr35bRQq4Fms3dFrbb7BIesrb8VGhMKtA2Ufe8Jm0
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCRWmjWX32b/C+JD2Qy98g9XsMKat8t
+txzbTD/K1LLaddBFvOhq+5uOpLp9E7ozNa+amW8+9ZiNYIAySmOKnIoZmXcMeXmJ
+qgE4cOLjESvwJfZ2g5HIhHB76gS6bNH0a0/9MHYOIlbO9hucnsZ5FU/vX39CG/Md
+lGdIzMWKfHRoNasrGhbQPfT8T6jii3gbOnMXACHLQvSb+1LYJ54O5MaVG0hgJmOv
+RtzkBHHutUA3rrkxRVJ8m3D5OYWt/61zYMX6s5C4tQY+nbCybWVoMF9BOvWHyS0r
+JAj54APbYhb9XqN8r5OtVMGmOM04hvZvk4bDFfVDLWV1T443aCg795UI
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAwIUdeu3RlI4VSUCx/B986DyBlOHpUowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICsjCCAZqgAwIBAwIURY3HXNyhuznXzmhFz9HkaVU2B6wwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjQtbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAHrA15/NdUcvtlYBXjOyFmGft3tC8y1+UdiekUSyKnvNRvKIOK1aF+Bzj
-TbAd1yqr3dldawhZmD1Ubv1jokKBlcUdFgjCvdVzQ2G1gvk/+YSKNSLZj76B8TBF
-fhtCz1sGfnG9k34BAjOK07bqB47seWr0uFGEgzObTbNciNz2u9VEQx0+RYQjJSsm
-8TcrocTUgMw+M/jdbEV4ocbKPz9134kNeqsSP+YelzIb4SZtVEJ0AKys5Hisejso
-QaM6Y+496jfxrwq8KwQR/jWtgLnpdyL/iGzov33XQempOXv4PgTULRBthvIGLlVQ
-YK5HqoxnI+CDyO8Ju1Vdw10lV9yxFQ==
+AAOCAQEABDo4ynKPYsy4A5L408h/6SxKDgULXYq4eSXflcv7/fBOzJ9RfRVxaYSn
+hT8v5Ob05Al8nmEnwDrZhQJ/a0NftCgbi5NlAcNRmPG82kxtY9ysq4PQdWtAd5rS
+cOqXeXDZHVtMTzuyVOrYrEut+Xp949dEjkGYf/lJ6R+9kKZmH61UR6B+gWBPO+9s
++IQT5R15Ad1RdeQ5XQTlCreiCYYuYenEZRGTAf/4hA9DcMS4EgYG+P7kTuIlnkzr
+T7U5uLJHLrNfCySMMPp/DOBJsiTE9ip25fxNgARA/wStEisF4tE+am3xO6uBtCig
+ZzgqiqBsJ4Hd9/TsDSYpyMIN8MrcFQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUd0lwQKQvDSyJ71hP/9qi5tID/NYwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYxLUJDLWNBMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUWfKjrWSyOlPDr1c/zjk9brd31h0wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYxLUJDLWNBMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCRse4vbCPNfuGlsZW38RCw97Cn8EOxYL3exkThs0lPgjGI/7Tv9g7M
-EiYIS6OOWF/uJNhM4hw3p1f089dvOImduG5Sj5tSo2N/8JSRn65sx2LLKAAi2FGg
-EkMValfRi4FA10ipYHRGRjfRmeauJ5xwAfortoy9kxVFCg0848mfg1xpv7Y+PHTT
-fGHvygrrlWZV8Hb3HZ74wAG8z9hvEY46qbtMZlIhne9OtCeaav5qAcFjl0vYjq35
-jP5RtnyKea2yMu2MO4k2hhFO6o54YjKvu8ZvXvT0sdp+vjgxbiNdtDvwugTbE4yE
-b3ifnnLrE0vDYc1s2pEsTRBpTp4SLpi9
+CwUAA4IBAQA7wu3iMfpX7WvcLNHwjsiPpY9s+By27e9rA19+XPKWQuaex5BcVE6s
+7REX1jAT54aQaJ7+t9w9eSiwdwAW5dEtRXpTeVweDNZDEwOeJ09np1X2VBhvgG9s
+0t/C8nU4mcatTuQXK+tMFte346xhKpfXAEtHKAfWhWjlzeivz1LeN2/oh7YjP0yw
+nRBcjMohz8TIh33Nm50m3EhwVQIxIwdsD67+e5TSwN/p3AXt1e7PZy9kxFUqWz+f
+SgA9JYLsDlj65PwrbMaOCec8APJQ1CaQwjIJCE5ZhYf2mraNUBUwKF84SkUGbu0i
+y6QoKSMZd0+PtH6PrAN3ZRcyDzQHV837
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUIfUkOf3yuYxGurJDrqKRSBbFTN4wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYxLUJDLW5vdC1jQTAiGA8yMDE2MTEyNzAwMDAw
-MFoYDzIwMTkwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUFT0CjiFgZwHeRnJwiCTb4EVa6E8wDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYxLUJDLW5vdC1jQTAiGA8yMDE3MTEyNzAwMDAw
+MFoYDzIwMjAwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEANnhSSo1Zm8Oeq7DfMdY+fPqMKVPft0PCMijv4K+ZaAdVriYx
-HQ7CqtZG6wWOiZoTLFmeShapcEMrhSVub/Wio5nxmp948j3fPJl0k7tSu2QUTpKm
-nX6et3d4fLfmf31DKs3dWCOp7p9eza0um2heIue2UU2yTZHbirk2b0bnKgfKkPQY
-O8b/5BRpguz/uSOfCbnj+WFD7f8+LYDGKZl325irZhKCAjE8AZeF9dCQlgHMFK7u
-/pR35gZvKv/Lz8cK+/+6WrvtwmKrvlNYW/ATshuK2t8uoM6B+28j3Fsv6IoAWMCD
-IAkPxvGli1kZ4ECpPt7jqXlklCDdiSDLcrH4Pg==
+9w0BAQsFAAOCAQEAoK+3rVBlERpvjOUoZZQpcxwx23D7JbVlJzEIZeSofFDx2H+N
+ZwpXglEpx9UJJpP724ber5+xwOLQdMt6xLE4b0FaAT5zRyf9AceFv3XSo+MMfXXF
+d4m6Tqt+au2MjmH6xK4j/0LQkNjiMYCBoJOMi0sZOaU05Qvc155JD0T5CsFag1yh
+eSRybycGWiwKiH3PixwQGDseo9TVexKu6IsfPL+b3hSqf2H/9cQyg4fO21GFltko
+AArs9GAwuqDee3NwhJSwLNoIkhGELnXJc9ZdjBdRED2HCAr8bJaOT49nW7xbOlfb
+iMg4aQwFqOZyNGW3KucUgQEuB+cRWC6RVdLRgw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUMZ1n9PMNHGOODsi6k6uJcahAT6YwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYxLW5vQkMwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUcU9vey3eYMsPyMupYoWHsAgoggcwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYxLW5vQkMwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBADd8xg1EuivMpmGVpwCdDACk79duJGtslNbZRmT/WEDPfwWg8KF8tGd9
-r3gwJ2plqYVs6zACQbB7MI6xJ6YabrR/OC9F7Yb3NfDZK7aPVbMyTo7zHlChEHoa
-ElT47Ww45fnJbaXsWgO7m6bA4k6kp58ZCRYpfNIecysRcjpQAGPHJJKzJh3CpE+r
-uti3LskUxRjnJUbhzsqpR+F79Wf94BYWS1I97AhQGZEoGYjeg8yCM6IwfN1d68Ar
-gAhc8s/Eja9Rjhe8yazcmXXh2LiGw5fLnGFjf3IsUD0Ooe7R2Lz11hwv9UDrzmPA
-fg/DQhJsUIeIwbOkYyvOR0kICYI6R6o=
+BQADggEBAAFDYsrERGMBM11Zlvnhu2xyRhDghh/2XBWgeOe1UPrZIZ2oL27tI/P2
+q6BJPL1Bk7dbjv/4Oo9CCXy+VunuvY7rRqt3Ek/90GHMnxk05KDiNYnmF/OG9/Oi
+uZ3ab/Zc1BdvMhSj1xJKBEs6SYmYLLdEB7BbkZqAJXaGWyBFBGZgSLLIg39KjbFZ
+/WOwsZfe/JMr/S/iTTMnbiwqvvkThgAbzPj2Cj0A0pRdv6Q/89kxskU3x8nl0czx
+ZvIqsxEX3WlUV4PaapDgEGD23UfYu3Xm1eEdI5oqhmKaCNcBHgBcf3sdRUqUZChT
+nWfoICh8++baHUr5pyGj6cyUfbo2utI=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUT8chyAlgR7SEGqOfBab+BTvPwQAwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUJbaDzJd6yY9Z2lI/aUWU9ufRyvcwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQBEbQ/pOwYbfO2AmFcl3n8w82wG+180o7sZIAlQHJdY3ZEUIYl2nP3H
-rLlxsdnX2Fgh52rGwT3xKitwVa00oZskLxGUzAqULc6yGnGx5BaepLLib00OmPbR
-aod+nGQR7mfbnyh66Ny84tsqbzdQ713j/P9lWwko983AMPLINaobcMNmK+X6qYt+
-rSIiw5Oj/SyD7YV3quhn8bwfnZVF/viGKX1EFNS4IWYxxkPPrFvN1YMruMrjgXRq
-M0uxTTXuzMGv0HnZ9REZGuNLOtBaUbWtFZ5wTLbQwnxOwEJw5SVRlbW1uBDexg1i
-HNTm+w7YmKdK8WxC+sVXS/KfVJ733mpf
+CwUAA4IBAQAAGl6MIn8reL7moScNTGfDPbdiTTXIWeusGyeGCRkIhNS+sVddo30I
++sSCR8+vEdk9jxj73rfKeDRig6ZOV5vl9o5s5QZVGlNzozyHBN8uPkHlKqMiV0Qz
+7GdY7MH5a1/wX9JRk+j0Zc32DdW/E89xZj+QsxBPgjdsI3lLecI3+imj0PBR4FaP
+Qje9Kps9ec9uTxcXutS3zOQwAoSO8NRU7aBBh3I7vXtfaMHLYjg0J6rw+A2ShSUu
+YwZkTdCzw5YJphM0MMcoFTu9sVmH/zU+4+0TGiNwbD+VspWs+pNNK4ixbOFDXPNu
+p+RQVfODGQFoV5Xh3NM9IdmJDc38kG5j
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUF3wlOPry5/zIwFNuH/yCdfToyhcwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTAiGA8yMDE2MTEyNzAwMDAw
-MFoYDzIwMTkwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUQx9omO8CDRlQzm1b4tO/1d3HwcowDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTAiGA8yMDE3MTEyNzAwMDAw
+MFoYDzIwMjAwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAVerakBDhatS/IVy7YL9Il/j7rTKSoeAmuPnrWewYV6vI8Q5s
-e2Blnsr+8aU3eib9s0K1dSGA0dvGW5QRlao5WnnB4eYYncE4/LltfqOOApMvERW4
-8U1rZx8HbikA2va+kstX1HTmPsioOIFxkE9dSJaDU7ResybrqpW9b1qs2UqbDNZa
-jZRfS3Be6ZH9d5NeAqmBc1ua57DCI1ltEjhvqMOsuhpiUUWeK9AZUrekCSPB5REl
-7mbEgc3XlM5INjtcJmtdwMvUb/TK29KMeQr+fS1YS8YLAL3vNDpcrQCX9sDlJ1aN
-xos/yiQuLlnuOMCKZgVS5Ul4xFElNM4cU8VUUA==
+9w0BAQsFAAOCAQEAp2p3jCo4PZH6DEgaSC6zkF2s2AVDKwtuSJp4WCMJWncs3HB3
+yB114WvUwXg9Lc2ML3pzmIGonjp0w4MVzNRLpBIl8pfdv/9Y/hlyY9YIC1H3iDGQ
+XiTd+Lmxwcw/aTHZhIRzJAuHfaDAKw2aMsT5Z/qMdd1EpUDfurWycTwuSlQObFdw
+ssyIzGszUtyDCezkFNMVKmH974SZeuA4SM051ERslHS6aDRFqzvZSpg46S1LD8wd
+U10tkT39hIL50l8FBLPKizDSOOnBY1VzCMgwvIaIAhJGTouJzc/GASFqkHpKBTGJ
+ljU9mtvKwKzQgNNyeFFxc+Ak27fgvc8rmxsIgg==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUS53vBdg/DNhvDlWK37iGDGdVtH8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUQQU3miCwoRhL/tFeIbbBvRgpwkowDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBALFcMdrpVWqP+Y1hwIBAIhwpNnmc5edpxq4gqrmizaM+nTprZzS8ncbv
-mgzE6wDYOhe9hUYKr81SVGw8ZHxQwHXu0AHtN1QyKYQmabDErff9pjHxkROJkeRM
-Rq9lORhShGNddyCes6RMaMpBraPXrkWYiFL0G5TxA43LUs6V2qh7nk3BpBnoMbbk
-FvjvmIE1nna0571oYzazMiHLrSa6Gmi1TdznYUSKhbGsfMn2J3tZtmUcogt0+aHt
-OAkep7NS7Zz9m9Bt62tcvv1CuA+3xqMqnLdJfMD35o0I3mXe4X3eixFGASBe/v7k
-OajE8O3QkmZUp2/WVyIyAZcdSu0cEnk=
+BQADggEBAC4THe9yrVJcopQzHGgcuPWW3wYw0rEPivwbM/AMX+HAWx7RHZT2vxsh
+8Jac/9SQXljk8S1SPh1fS1W1DkWl9eDHVtHalD2/RbAMulBPOQIk+jbJrFXszy7D
+XrijQRVPHEXVsPOivtuQ9E+HOcbu9bryq3dl7pSFDXhaarT+8ewEUCI27CT+9DoC
+q3Ev2EZKP4x2Yn8ZeKJqAEL78FjMEOhzDYBQHeaw37T0QrRCA7+ZmdhJYkRJ5Pe6
+2N5m8ts8obPlNy7H0vNUGqJjQiwOd4Wd163Kzmuggo36JNfrhmsyduYoQK6ytEVm
+6w68YxOOT8VGLVM+VXgN6FXL7ejN4nI=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUeV7+UMbqlpeQyOVp+x/ZmumQOwwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUZR5NipaTOkQx13geVoPmn0X/1AUwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQAK3RfPdueOsQWtrCKOclnc+JRL9I4C69uhP7U3uAGeLi3QH8sHyh02
-8H+LlQivH+oYJppLls3X0VwD806YXpX786RoE130XrC+x8bmq6a8XHVfoTZ+3dv2
-N5CDxUlqSNtl9HwAl7wsRTG2lxJnL+A9FnWz64FdZhIvAwxhoBa+4M6nkhLnY9DN
-kJbBA4/4JwPTRkQNCWRPntp66XL2cGmrTajVRCqVgdMT1EfYZnm88KgLvyHCTkck
-omqP56A8mNVKM+I5eUYIQ78uHdgxJOrAuuLscfrSkHscVE0obA4nB8aRzK4XRGn7
-+kzTGWBmoA17N8xyM6NEn/s1aYBu7cZi
+CwUAA4IBAQCgjlqI46qsPiwiExoD5W4Kp70Ao0sAHiMqoy1P0bFg4COQYUWDcycc
+GkM+CJTar8EqzdctajTqAfU3g4f6So6HAyCgHXZqFbbK9xoRLhJY0/1o3v6BwHtv
+6CPcLKLbNZzQT1/XTL7g3Zk5kQC1yQZXzDvoUBh7J8fOuug3/B5PxJRE0U9+FpRt
+0DgMDTB3HTcwz0AX/EoC1/uQvw/qPktIEN0xRufx/mTgxebgiS4UPv/L8Jl84gya
++J9ghBBM+Y++XF5ssbtPQz2zMuTnH50a1cLXkhC2f+UWblBKP4RV939PugYaOLVR
+GYSKZDPTRWiI1IQbm51E/Z3wcV14aVM9
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUSaSQpecxkbwGC7ezBo8uRUtO/pAwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTAiGA8yMDE2MTEyNzAwMDAw
-MFoYDzIwMTkwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIULypfKfKeT+WfWTxoEzZrk4AY67YwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTAiGA8yMDE3MTEyNzAwMDAw
+MFoYDzIwMjAwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAenRiozWr5sirlqh6m1Ha3hFznD3WDJJDOsLuV1jz7O8oGaIq
-f8bOr7vuo7k1kzs57W1YAZRgwc+V0IRfZQ9rrVrJXr2gDBoQghH0EF/pi3LdrGFg
-CBjy+riNDh7BVHHGd5vKWGutpdVvEpG4oKvEPZ5vieE8jQHMzYqcQaFlbHQpbH2X
-f1rUX6+iRgavnCb9r4dCNi4vCgq+scPsqwWrKVdZZRpBPW5rnMjR7TDs8wsseFi6
-svzfk6Xz2vWpsF4DvKNtJWuUKyzoyfVp6bmnpWv2emOeFbeJuFVxv71tIfr4eyly
-svGh4WG2C7jS25dMLJIl2XkYhFvh2Lsog2v+rg==
+9w0BAQsFAAOCAQEAdlGtvAQv98wBTaUHnfNwX/Z6OoZgJ1aI+q5T61BcUBErLqT+
+T7pxzNHCcOKqWJ1xsDLDyTAvMeBoHeA+22v9f+cuCzzfGaMWfLDedMoLnmVyFErB
+nLH1tI6pa4cOdO7kgBmjHGYvBMgsj/88dxFDf5mIM1wz/s1NRfCtX8Q5U8M49XNv
+Yyw+OlRkPKjUMUQmjakM5VHVNFE1Gd2lEGfJVbzgX2Zq7+wxi5d1qmeiC9oNpgQP
+qDEgPliqnzcFgTgxqO1e0bwJyKz1bvm/rNE+FH4MIRnPWEbGKY2euuJi5BpOEC5s
+TvzyxmJRqvXOr2XyOZXmikkQTfmSfNfANEy2GA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUaw9HVVdXZWVmjJKqzOf82NR6At0wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUE6fBZMru37Hmm40W+2PUuf6hOR0wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBABtxy/nr+CLVrzRhswJSS3AzH+jj1TSeIOlK+JkWhSOCki6Q+bB8R2Ya
-4QOwovRozrz3crFZUTTicLjXoE/WlKRymyYtb3xCPuqTwPkXUZLx+1e31aaRawQp
-kjWMxdLQWyE0QF+/mRzciFLhHpxUB2uZ6US2DQ3MhkEXqPb58J9UCmLuULbIicsC
-98Im8fW0g496hCUyAreiG6yqQgIBs5ysn07zIyHcCn2fBA3JolfqOQd2gWG+E/Nv
-bG0XlSv8OsHduhVGgVk/GA7RD8Gjc7K6KJWETTDKyZrYpuDlSlnpZivaBsQx+kZw
-aMe6aKAM4951y8AyS8angbxW/NePwdY=
+BQADggEBAJqmzQhGuUUpPZWramyKDZctmnUSZ0QNYo+a2/qUlYjQR0nhRelM33U0
+Unsmbe3Au0G5sgk1ir4nmsarLXHl6TLBhuyanSuWcpXZwSeYVUOTtpOminv5N25c
+mX12XFQ2VoeSVsMyAoHn27ROzSku7CUNnl4kMOJIaysBYJYB07PSijFqQwcRy1Q6
+nDaP+XDkhDNGyghHUL1yezMpln120LhHOG6Am78NufrsnbR5WqVR3mT1P2vT6ztB
+gAz2dOjbyEqBHYIOO9NxKXoDuF/yF42IZ+aNt8zaUXeHyV9jZ8n/C7Li1EhPEPco
+8307b9JdEyycUZOT6Pg8xUP0LSJJEfo=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUD/Y+PmPP92xqvrPJaL0A7GQRfYEwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMCIYDzIwMTYxMTI3MDAwMDAwWhgP
-MjAxOTAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUf3G1amT9AfNeA1szgif18qWktG0wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMCIYDzIwMTcxMTI3MDAwMDAwWhgP
+MjAyMDAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCNBFiNPNxL7OkGvMiNtGCOlConNMLNvgr4CzLeqwYdFVVwRbg5hi2x
-w9etVoXGv2Yxckbb7vcfkSneK0jgAg5TPXv+dcqrNcwi4naRewn4sqSuWUJ3oHTb
-rqDDLLKKwuMdQP/G8i4P0OR2eQaBX52ZU1BI+Z9DZASwLgPfaZfgXdcbOoDhbj3t
-yA7AtCUCHUf0NzteJb1JhjIuiDU9myye5LDWPOkAgPIiIAx1mV5zbBBFkShg/tcz
-M6e3gTVbrC8FRNrlDgnymhJOqjvWoDerIZ3iunrN58V2h4te8zvkbmGslMj3e/IT
-n3q+62sO3umf6+iOzgfz9xZ6UJja+ExT
+CwUAA4IBAQBVPRIbcI3CwyGfGBcl39IDYJJXSTK3Pjlsmk76680NRKx6ZuV0u40L
+njpSfePGQGQZu1wd8irj44yKbOlMBs0aC8nS1Nzss7qWtpLrQxBzc4uzr9lzkhvZ
+DFA6pld0RPv5Yh+WMJbpYxeoeRJdfJyLQS/BlHFqByibKayZISLOiYCMBr+vWgH8
+CoW064p2OtUyfL/X23GDBZPxMJvJQPp1pZZhHP+UjJJi9sB26fESt+h6ohFu6uYo
+tCaWUmWPGucY2e+SKSC+h8A/w+tT6gaLI0VYjevgW3Cd6h9WRSiAxTvtgDzqpDdu
+GYtjapJI+ImVgG07ix+64MRxZkhUbmr5
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUd4b6hnljowYPB1coJqGKdz2d+PAwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTAiGA8yMDE2MTEyNzAwMDAw
-MFoYDzIwMTkwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUMW6a3++SM0Q+0y9qAuNxklyhm+4wDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTAiGA8yMDE3MTEyNzAwMDAw
+MFoYDzIwMjAwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAoow3nVMrpYRzSvxaOPlN0P3OBEojO3+G6/qN1ZqjlhGF9PXA
-dXfGCuvgh4rPAWWQhndlWmP8T6Gb959SA5vjPZ23YIN+bwq7nCG5Al9RWBDLZnZn
-EB+59Kyhd4YpoE5EyD+QiZ5v5Sy7QNLXy/kjuYRrRXrHkqxugNOXIl5T9EsVE444
-WRPqgU0g2cdkx9xpbn5+sWHDW7Q/FAXNfjXY5RJdEKlugIbg8Zu8gkvyg7V6Ek0z
-4JhIJQveTf4/5upIygJrnpKnMaPnkf90IxM5p/Tf3GoG2yWu1t2TX1BjFsvEvo37
-b0CuuvSbTthn8d1/ti6xpC05+G1XA4NkJLRPVg==
+9w0BAQsFAAOCAQEACPBMxmtVB97t8+NUdN/BTIJ+fVO/ngYGZeaGW7fJcHFy+PuP
+kuQf5CY+rfV35XWEduXNX8idf93t2RAi3kJeBJssGsj4uouhcpAP/gYbNvPLKyPj
+6dtFkHDm4Jwsv0Ic8UCWJnLC/E6xexgFcPKxUu+HxnTTWAKOeeTrpYdZdSQ0HhOH
+0xt+mz9jmpTmaWOGXKtnI7kT5ig5xw2wydDhM/eVVbwd5+05enOCXQbIsjkhPQ0O
+g0dttXTveyVVRCLxeOzWce6GkIgAaUNZH4pqwLAkbzVSzkK+rKOYuvgnSUw+NV+k
+mrlYGjcD4K29yXeFT5V9ChL5Vn3NKaLAXykpIw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUA+gtnna5IIldxFky0uT6sK6z5yIwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUCeCUN/8iJU8SZ59SiT/LerCgF/owDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBACWg4eyzrX+44KH+58hwLyKFo41MhuCUmL9zyoP5sf0EXmtNeNvzRGlu
-sdPLky4G4vdR6ReanFhKwunZH7d8Q4kT6XAfD6z2UoXSmqaHbNZxs0iKCFvO7BIr
-pU5E04gG4qvMNRp+Nrw/pVkgYncEK1vzy5HSYGGzmCiBV53pMw4KsSu6QivbSOZv
-bF3BXecso+xZ6vlJORD4GGs2Nj0UqOxIFrtfGc/9tykKdBI2Bj/S99lXaTn8scWZ
-fqL/T3q7MDNJUJ0P7i2kRyzAd985cPcSFyRI8UWKe18xv5y/q1MKiTqVJhi/YPCq
-ERAcxdhODfA1UMJecCPIjfgTBE9Wrmo=
+BQADggEBACsvEYenqheG8QxrHP5TysTvFHgoHIqfFw/Z/VgnSwXpcbU2tWVoDLYc
+/Vbvkc2WSVqgv3WeetVyt+j9ehu6tenNiQwVUzufY08AZhpBPU1SZ9r9Pet3DGI9
+2MSCyUvT8ZktnybSnMDT7ih13F9wTk8pR7Ij5Fbyeedu0WE08mvKv6g8OiRgztfh
+IyoaBBTiQxlcu2DKR2Av3vheWiU+3LTB1fj5b4SeR/rfkGCgIHOg15Pg/Ojdl61x
+Qg6MBV9anyZhsOSXRW3DJop7txy0xhjPzxtiR5DGCmaphhhyVMGbe8nBsCC9ypXA
+mCkDSap3KQvtnjwsDCZY6pREW/Z76Bc=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbYCFEN4HK25M9F+gJJQbNYymjU00gOcMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICzjCCAbYCFHUpXSXVJ0CgxqQenLv5i6sF0ytKMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBcxFTATBgNVBAMMDGludC12MS1CQy1jQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
 27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A9
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswCwYDVR0PBAQDAgEG
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIe9eFTCzp8lRTMs8Okn
-ABskIxVAcZJ09pXi+J9jV3FMonAooAwTfAc06M17K8Q3UVTgCjRJD6R8j3JIrC0j
-wLv7yueb6q5j1+u0W3zGbupLJDE4BS0hBF4sxaBSU0+wg6Wawh3aMhSRiS4J5r8y
-eYqzoxyf5i40TivK8Pep67KWYlFjTC22mQqre3iTO6gw/eft3d8DrHasrJRLz+cn
-BtIIyG1im2BOtvW+65UtN9eGc2vJWgLN4LZCdOPktQqQu4R2gB8h+UStwRH/NyLd
-AwAoVOh0DnkZx9zhKDsLnx4sjPX+T9vg3x/N+YQdVp5reavr5Lx5pO388EtSQ3tv
-r8k=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI85l5tQqS2DRtHMetWB
+jdhPS6O8fPM5hUHUanabePxyDdSeMRf8BdAwc4Yzes/N4679jKFM3PcBl/bN49qd
+ipBRYQShDs/jqP1oYWJuAdqOwB4AK7iLxINJfuwDh/kMpSFCdyfp+LzgyFuBqwy/
+Bpo3NZWr5TXcQz7x8VrajIWEeP9Ca/R6XPJ7IM0DO2pW9rN4jY1bPIV7imr09UQH
+jYK9vVj9g5NZhaN+HzHHPpDMoeLbpLTBSd7yJLjiUXg+Q4+v68ftuHawWE29pvps
+xcUVPqgVwqONsOO2rTxQbKMqwSzjjNxJGQguC2DG4gUHmsOFK362jRM7/uyeePhX
+tTs=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICzzCCAbcCFCl0ctVCIC1KgiXBapqicV5OKMzUMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICzzCCAbcCFEFQ6CZUVh/b+B720BRY3J1LAm2uMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBsxGTAXBgNVBAMMEGludC12MS1CQy1ub3QtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGjAYMAsGA1UdDwQE
-AwIBBjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQA3Q3A7UVcj3shcAm67
-TWwrEtHRiyfoMEWBuibdKkyke51mvIxBvK8bHtyzetkIMhkbuBUe3GTbNqwCmbD6
-BbvPvCt8ezEtShn2lz2N839tSDULO/4oYUnZFoqQKjqtJB78OMuVSwIxMOV3uRYw
-06eQv2fXwVPDU7WHYigvAoGlhJA18jRw3MGKbRBPp7GxOUmrKe2PkIsnxIxal18l
-r1abUdQrvVhVlUxdWIC40veQGO1jS9cCk/6Vc5935UE5bbu5Owy5JZKT4kkdEiXJ
-3QShIdQHR7WFB5i/MsF/7IlORK4wm+eZ/timSP1HfHOYi7CtzMe/fwKhGErB28jl
-iqJv
+AwIBBjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBi9hag8sYtN2dfhqof
+w/o1++V9gE55Y+W/9U2LBeA7/FZ33rLTUctm0WNUlAJ0e0jD0Ga6Xsx2r79cYuDz
+nux4Fu8Rl5pF1k+c94RwU7aRCYc+UzimJRnhPT4fdbvz/qejXI2LvPgU4ZFEp4Hf
+xk4JE5m0fWbV/5N0A64QpTrw6ek1EQmDC6WcRBzN3mcRKACpn2iDwTqy8G4bWxVF
+sb/Nh3NF0f0zZDEARTZxU4mhuQBdONOHUnhlyhp5yJkAQTlAH5Gz7vLYxi+d+Z/M
+K+tfto+TRSJG/V2dpbqj9x6t+wjophW2AOJexlUGox62W6OUX+WbWKGNM6BWA6pH
+DDOo
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICvzCCAacCFH9g9TvSRJw6pv9g2TSRVHaowrPcMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAyMDUwMDAwMDBa
+MIICvzCCAacCFFFHvYehWdffBBkr6/luGMAeLBIGMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBa
 MBYxFDASBgNVBAMMC2ludC12MS1ub0JDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
 uUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3S
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAQYw
-DQYJKoZIhvcNAQELBQADggEBAHfKr494G8ghKdtDpXQpPOY4Mswrh94gn7nqErOk
-GY2QRs6sq1VZDRCCOLtQML41ATiK03I27n7JBYaHM84jtZqpoVkRxVIs+PRsX9Bu
-MX9HTD4EgMRkxF2xAy6OJTuwtaZJ7unGUHu0/DbZGTxVmJW/IcThOcNf38u7+Y4R
-OJ7lVqW2Ii9AXabcY0sDFT9HgeOayI3y3tLYjK/o43uqggRMXcuhjleZAfwls2xz
-P+8ibESjw+eTNiXVy2bfWA++zbt42PLcCsgtvyyQ2qzwXUOFidlhe1kv2E3KfEHE
-nFB6uRWEhxUCPSglt1uWTr1KKy4RIGpRElADzOIBhIQDUG4=
+DQYJKoZIhvcNAQELBQADggEBAKwQ4w8vjRGuFRiFFZPQm9Oi624o3J0015oZZyBc
+IvVmz8jYGBi99Urnae/EfJG8wVGTlrhKbWbf4xZH7I1Ju+i5o11JgxcxECA8tLQZ
+0KsJDbBobO3jqsb0ttizuPnR1F6xn+M75ITAxRNnTjXvfFqMmLHPUyD9HvNbaPqe
+Yzg7eH7XwAk630T9AzKfzY19eKfKbhT17hhpJGxvc3UtMwOqGhvDjqRtgDT0J3q0
+NkoRn+CN5wa7O5dwNgzfBFUlyWbL9N5FN66Z779nGZ/VnQalDakGHxDRofvj/AZs
+kh5nJxFzHt0M25aZMxd3eYBcStyRNuifaADjZVANq4HB7gQ=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAQIUX4q3pjYwRLMoJ9A/1MvN0m8/Sb8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0zCCAbugAwIBAQIUUy5n1OT0gVS2GN7lq0w4TaKfH08wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAITiq8ly7nsD9
-nEUJOoS49UlJcyy18+S0bUv3RH/HuUxlwhDHyPiKnqrAw4PuNoEqDY9oX3XMpPN6
-Djm0PPIBDIelNatoH7COqash/3JLq6beGAEvlwNjkj+zozN1VER79SEkcsAbnBtI
-yinHErAIusMUFNG6SXw7FSNd+5NC1xizAOyBy399HgOZ/6vE0L9jBdsVVH22Uxqf
-T8Zp6mn3l0vPBmhxFidnqBvYApzoQIYH6wnFSFO4xH2L6QA5SgCntAmCc2uyZ7da
-ul1OobTfUjykIJg9Zb/0Mt2ifzAm1+zUfICBr64WyXvTjw6B+GRSGDY91gZd+czH
-lidQa0pF+w==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAhf7olKDCbkOB
+UrVDtfUYbJ0pRP1dnJemHopw54PZVMJykvsw9IDXqPFnGkJgmckhdtnaYXhM24PG
+sIaYZ8EHGamgOW6lQM9UghFxfeyJwkYBzYdIv/KGACNB0TNN4nZHpS6+jobhhl6M
+Ke+yAyMkjQjRFLLCegebCEaMTr8Br8jJArB2TLtIITqBVJJPem4hkFUxVd6mbbsz
+IgMJWPAeIZ/qb7H3+uVZxXLlBwpLB76RzllLPsx6CIT1pb9oB+HbbQfEIJe0J4bV
+0NtI/caXUfcXRmFfP+eaHv6F3LT70uQdHm3t3XPP8Fh6mx8BzPGRxRMB+ySqyaHU
+3rtt+X0POg==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAQIUKXweIyqI6/2TmPqQzjTrh7hTGMQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1DCCAbygAwIBAQIUGZy2PiarEoX532INI35KOVxRPtUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBADHBRyvGBvZA
-QqhbnEgZQFy5XPlJk/fQninwBK7igulxxmIKYK4csOT8q2gtH/Z1s6tG+HZ1nSE+
-UjRL0Ymv56j/Zq6LxGT9a+q0lOJaXoq+wucc8k4EQx71MmJWSeCcRsvJRlmnoN2R
-kMJmXD8+ndpsnYIVpqTm+dkwOwvQsEon5g/jMi76GZvZVIxv90qjgTeY1H7YukUz
-x3zVWYK3tZqJ3rqLirlOtbjsfw960TRrlZgbnaT3ZIXIvj7aLcDQfMcIcPJNHAZh
-9VYwYkWsqO2XIyj2Rk6Gga9Sldsrn/BhmYcS9i2gf7aF4yuw5B7C+iZZnRmrG4k+
-FUSjgD8rOQw=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAJTiPxt1KxMP
+3adBNIaQKH7b0igv1P2vdFTUZqRWvjyU66+fsdeE88Nuk0F6PzhfrOw07ERrygD0
+BWC4zhrd0mXas2W61ZhJ9VAvJ0+R+JFIIiAd96p1sLxvgUwJhGSo/i03U7UMc/Hn
+zBhZ+ssZUkmt6DaPFdxX0Jx4isFkp+XdFPOqE90QJRUXRfgGN8Kv4Gww9Co/BSHy
+kIMOoVm+YPVYcVau8BVIAptw4CUxuzSoqF7kGPvRY4aGWyLjUS1lPBipcPqT6gLK
+y67HGTOez/0MwXv2bm9Wr0zREFD2ufUtglvc1LRqFtsJKfEM9yOFelGIHJU2XXyS
+J+NX0P84fdU=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAQIUYTocuSuWro5JDJHGUv4cd/8mQr8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxDCCAaygAwIBAQIUCWHypAovXpegrQvuRM3bWxuFLM4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAedqtzgyyZf32z9R0OlAUhQEPL7gC+CN7
-1FGQSRE6skJSxQeMDH60KdDlO5/Tsu4yoAbKhs16M2A8JmLfdrm+vTWYm34QOKMF
-c9ON1AMCU/c06VcD9UjeOMcAjgqUhUmMXFERRR3xWUucj+GECJ+6BTzKfBcbr+bl
-URUjl1dRZhTKd1ck8YQ8kkG9rNmpHWSu9UuJ/pZaorEa2r2HO+hvHhjpX2vwvJR+
-ySo1g/kXyUrctba1w2/ikB7iMolo02MyoapY3GpJ3y6r7lRmr71yvrjXXITBVq1Y
-OX66WntFzOGJocTvNcQNsO45BgnBvQUNV5VVL1MW1cfFBcaaEVlmsg==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEACrJpyofHwEfUp1WG6GitGoBwHaTV3CPA
+K6u7ADaA47emOD+zr0dmjor558DML5dJ3xYUWntVdJMz0hoQ66D5vXUgUmPsKYhn
+MJdtgwEZ0V6gVwoSuvC1BOJYUFnJgn9BPNkD8NwLtNMqsxA9qIipD2DJUJd2NIQD
+BtXT8stV5RZ+qviOuLT1WitPkRudqjC4GckNWhPppQ9S7kIeXVVCwvoQz5uBacqz
+h7/qZX01zXbrtxJp9ctl8I0Sz2WI983kvZfks7i7tE70dUaWhyQ0zzBvK8iMXisc
+06a1ZSKqfgIIhjt4JqB1D1AZYOO91gNnFSyqRB2QqDoSNqUm3SyQug==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUa0NIg9jL1b8ujXL7DiC8zz46szUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0zCCAbugAwIBAgIUPeAghI4BYB3fkf/IbqGvI5C+KK8wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEARs1OtVPLdXpS
-3zFYBne6rG5EF2WSZ6xC39dRXQYFZKde67Rj3HO7Krp6OoywSLGiZJavjHtKwstw
-naENPStNYMKNRxha/X7b6rHGaUB/iSd5Dw8x2QmcDIWYHx5H6SI/3/v1dGe05qiY
-AiSXLgOBDOavEiX6B4SuaZMDHxsasIqrpFp/juGxaZtOdvY6l/PLP66h9qroh0AC
-Esq+KANLv89HaisnEmnfE6f9I6Rm1za/SWhyoe08c7+Y3KBGh0EUnGtPITij9EC6
-ByHCjpAZ1adH13ztq1GvGh2HN8pnfyceCKHTbI2cbb6xrv66mgZtkYRlDPeWmV9x
-3l8AqwIK1w==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAXCs61yOhHChQ
+TNVZGoPXiot5pEtULM55PPfkNPpD/5sQUbzsJC+fWaL7rfebdVpyL2XbCKsvrkWS
+2lIQlnVD3XkOMctjuOQ3Fu4+Dd+aPKZ3O9lNn5koIS5ArMgrtkFehrrnKVMePcOB
+dHgFAUovY6Zingceeg0GAVp3wemskY9/DryxxxiE4oiM4+0dsMdtApsC8lF1r6ZM
+pqdpFFyb90i099AZLRJ8ErJxILYox+VnepZltxLu/J3StKHwOE3ndX1lmSWpRqhE
+Gg0t0zbaYTfmUlkD3/3hl8qKZy+4hVNFVACKuw8v3dNPQEUQ2THe8Il0BJlSHyPq
+C8EBUoJsHA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUPRuEWn2jQ8CLhKBL6yV8w4X0WaowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1DCCAbygAwIBAgIUOTd5RECh390x/z7a2MKPCqe1TnwwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAIQ63vkZgsIy
-DZEnTkkRq2BivL5R8grMFZJ/jZUeyVAWl0Kp7ANlv8Zxt6aaWn7hTt3FepPUj+qP
-dXIqX1s0/npKJJmK32Knzy4ebYRZWY9ImXwmizdAhSWYOxM46v0ww8l20i4EDEXS
-dPsX4ytFLeHzluTBJfpYaEkJWllDwYKcbnEzUzDQPemQAwXA91w0dSlsjkIUL8c6
-mWs0PJYmD6UdqwuGgy4MinW7ZpILLBYivgJbbmRcB6woK4fYPhUCjwhSok4+ynv0
-ePH4mRaZhPt4v5aXlR8l1Mwav1i8Xy7+MXv6NYU7tKgtRdB/tdZGY0D/YaxFEzFR
-2zPRlW+Qz1E=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAINt1ELbyOXT
+ndkMdvjENc6TlfYakw+uttbMhtONafSTJI/A/IO5UWqKQrygM3W2uxBrCh7OsYYB
+ckZ/6rNGnWjcFKALF6MKO3cSm/swhMo5j0FQk0pQw/+75owWh8qNdsnACkRq9MwO
+1Srz7quACa76t6HcJKpxwF2JbTL+FwxPC8JHpPwxugrLMYeL2W0gb+SuFF3Xm7i4
+rHUVe9bhHxOd4Sn1k3uk/iQKDtN1U5IBBpirWRIP10NWlGyUmGXXADsXONMqcvmB
+Di46QgchjFaaIOgqSrb6pdXymeAA70JcYcYKhh5t2iSHF60z0PV0GkWkEMLnIWLs
+XoZMw7pvS0Y=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAgIUOYkCbgQASPcAwBYjMQVhNvtxi/UwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxDCCAaygAwIBAgIUP4Eu8aZzlhGKcEW9eNYAunZe1n8wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAUkFJJ1V2HC3XEOSIIx1+qS41Pmp0Ip8L
-rEjYyMWbwVUDjHs1gAY5ev4A7yYccneuaAL/qZc6KZ0zsnJvojjWaofrI+wWmyum
-MDvcjDjOgXSWzCKD9VMBTmL6hM8/0RMSBOEjxfcc5oepb3d89EZIOr2bxLywPNCp
-vZjROpyjDMQ87WPMq6jB7tEeSqmSFB8g8DtYeAkKiI6GBVz00QwGAirR1D7B0wwk
-cEL3rMmsjkU9X5MqplEVa5YPoi7sb43TwwsB3sXJ2ZeOxV6eK0E+AU680NuKOvlK
-F3Az741/dF7D1GvvlkeblbbM1wfkKDg+3G7Rug4Dca/HFYOZmXXWtQ==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAhDXz8Ilb2E0L2N9j0jCxt3rBM+Y9HTE7
+jsd/LoXRqZH+Vn9NqfMxGRxgJUVgPhfYS/ZDuDJnWGohxvCO8gxWxjZt+XB/TjGn
+7SrLFhbDF+DpkcHa+VgkRlDO5fdhkGdkVrTQakX4aOjS6Do92mroPw1qCsdf6Dr5
+pXuQmfXP9LImMKIKe8qPT6pHWVV2/nzv+Q7YzrmL/Ug84XGWM7qJps/rPrDGqpSf
+A83Nyvc4BBf/SQa/AqEAKK2QGLRq90bFKJv9JrbdNHv4wuZ7ghEUKoDN+Rr5+6ES
+6Rd2nyTusmt9pIbtHiS/R3J+tCMxStpXhu9OV1dWbxRBm4nSei6M/A==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAwIUG0gANQgxoHJgql22HIZNySf9CDgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC0zCCAbugAwIBAwIUM3ZC+++pNP3KYxxNtr/xxDBJJJEwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWCvL9cCYJBWK
-by7P9BuzNG3ZaFBrnjqG1xFrY2JS5JF9xXvGLnQc2QzJ7NE8OZAJmOzSVGvIeigB
-U4wDX3t1RHWOftn0B8Wrmv3xz+l69QHNgUVLDJUSCitLppf+xxTmUO1AofH/DCA4
-wGtwRdUQwTR8cJdOJPVYa5TuTR0OW9syPHkC9WkvCDvjLPKsj3JkKW7Mx3RwiNvX
-x9cd9M0R2GEBVYVQgxxFj2uVf88zRiWvzS6KLVJS04HKHT+3NQd15hn+HeM8QA6L
-p2gowF9ZPzaQTcErzxeU9WMHSkHJ7+7NWlbDc9JUdA9V0uUZJn5IAWEKI2whc7YE
-LRMVWq1ERw==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEANoJ9zhMafJcN
+xwoNbWaOxJa+AlV9BoScch5JsDChRI9Nb2E1FZav8WZxlsVwNKA1ybvtPRjUIHAt
+EKpfSrw71zgfqyh+zW96wRKqaR6rXAnc+j0CgUjmK6MdUSpkXBjc6Nv5Z09rnyyr
+Ov/CodeaiGN+G6yk4G+wS1h2/lNo/O+pu6JZdc5GJki23szzt3RRvhSEHHfkSwBD
+UykFE7HfPLRu3ci82uj8uQ0V6koQwbPS4tobTnwnqw1QRLv2L1qWozVmkahfeHV7
+YDv7bEB6Hmu59kWmcJBy7hWDPlfkzVy3ZDDJZsOXZj768StdzxMO1PTOLPgkzwHf
+5mcoWBZWIw==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAwIUK8fSYUBZiUnudj+cWTDVHA3qCPowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIIC1DCCAbygAwIBAwIUTYyqrya20gRdyuq6YmyB2/9oqJYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAEFJErWpKV5i
-oiYaLDZRQXzhPgVbaRzAJLk7P/sL8Eo7iyoLvpC8tpO6hr3rB2dSoE1fwVvv4eNa
-9H8JOxGUrTBOFOOYdC5tqX+k0/sHNkkT97ZD+5nuORACvyr45OC5JNkszmBMyGr3
-1drYhGfVO6P8NegIDBPVnAoual3tTF8tGTSumR90hGqr+AepcgRl2SOJxDIOpz1j
-bsDmYulr6FrTkt4vP2F/j6+iRdu6d6rsUXrNdusH/U1ZY0FfNTpK7xFR7R9UZ/31
-mwRSOag+WWiRJU3dsdJxjMZ/i9EEE8HZSFgAiRggdiTz8vomFVNbfj3X6QaPewsF
-0j2VHobk/c8=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBABfopSwJA9Ou
+/fT3qz8rXCNrZFv1dZhk11ncQP7JyV3Uixs9L4lVjEIdv/IbMOHX6GX8FZargNiH
+SgVe3pQSqKAiMGsA1mwIOElrIC56U9We0GJ9si4J5oqeCrfKvurUAeiXpBhA9MoX
+5D9dE8rMpCvR1qer6LZtHLCW2pF+5S+n12l5vmfSh1hnt5lbxpRdgG9BKtKTgMJz
+rxW5TGKuUig41qr0MLCSy+fpWt/ZCOdEtrBp6jmMRN46w1ZY28n9b5BMq4f9pk8y
+tRivnc8eNIakSo8YpRR0zUG+UIrg4EnsEt0kieTw91tZ67pgcnWh3ZJfOCP98vLD
+awc+lgENJs4=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAwIUX0QQAsxmBNFNy3ZKVQYl3ApVgfQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIwNTAw
+MIICxDCCAaygAwIBAwIUJaHH9Y+9oKRAiYyNC5mudQkAr6wwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAfEPsVKZ4Rbwc7a0/yxL3k/iPZ2SjHRCS
-OctJotOOtV8V5ohe3hpmDS0mmmyMgchAKpSg0qpgBzTr4m7dlVwDa0cf6HQGvwTD
-NDETQaO3pbi1p4yP/dN5cVxT6mNd3tMb3XOE/DWRjpse/GYv/M2mXtRcomq6wJUu
-BOC8Z5OPHwVXZYelcLY5ToKUQPh9K7LtW9jvA8V4RXf8w4bJMRFhBoNRPoxqt67e
-i+fHh3SIcdh+ak2xh677pigduJc10x3ocZFjLSslPm3AJJ5g37UtN6huS3BUsZpA
-OHSGAmbmXp7KzHmNDypwOlKz4BwA1RJdj8gbtbBkSao59lQEb0R6ig==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAjw35kCBjLuaD6/vjTNfwtljstw0nuuDC
+RC403wlytb6cjoQingRcVC4l7UKkI4R7SUmhSobIcbMkLohxFL+GD+3TXRzmoZt+
+IuN4BRF3vI2Odjz4qOT3hVofh829z+DTJOBk+lH64Zq1O+51npER/0fZ6RCQxNPu
+oUTVhNq9qiq4e/rJ0bxYJ2JAiiVJtxWYWaquI+NjTnqsEZ/z96EJ4+WvWx20AVTs
+h8a/BhLJ42RDVcf2N5OPAntfG1LvOWYeZ74enQyPCzgzoS88pKkL6c0U89jEoiRz
+MPgxZEJK+dlaMkk2zsrfRwjiBL0xMu5kGvMpg7c9yybKptG/gYEKnQ==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbECFDlRgoHwbGH3rokLJ0o60tzwRaHWMA0GCSqGSIb3DQEBCwUAMBYx
-FDASBgNVBAMMC3NzLXYxLUJDLWNBMCIYDzIwMTYxMTI3MDAwMDAwWhgPMjAxOTAy
+MIICyTCCAbECFG/w2cBBqmKC7NQgKh3lfntgcSR2MA0GCSqGSIb3DQEBCwUAMBYx
+FDASBgNVBAMMC3NzLXYxLUJDLWNBMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAy
 MDUwMDAwMDBaMBYxFDASBgNVBAMMC3NzLXYxLUJDLWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCXh23c3kVaxQyRQQmu0zRgMJQU
-YpYt24ss2PJ13f2IOo62LSjaXr4rkU767/zp3EawxKibxou7uOlLFtVf2rO4gw4s
-fAb729EjmOug5gFgg9RbQryRexK7L4EIfkr6PCebJiYDKtv0o+rAxj/I61gKtrSP
-ZqQyXX0dzMiHl3QN1VVEIvIW5tciiUsrZwLBDZa+sz1oANdyIqwdsERPi1whWy6k
-tvnbH+s9cJGDjHDNzZfcRtWUuL/iltFWquq0ajlBI3dVpJotzuvJBDWZIUo/G2Dd
-8wswhBnc/xpMSodq+sv5XhR3mN8o40kiN+646A7W1otlSVsMoOvQIULuPnsJ
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCfQ3gJ7niWDv72oLsfSk0BqQH1
+AKOMCGDkFxq0RYadktwrdWRjl9kkG1sfbfQky1KSR/vrN7yaI4OH30xLukRYrW3s
+sXhP7HgLdj2wFx4hlKwHvR7ahehPNUttFBGPXNZxPBIJo+SglslIS69jPar6fCtz
+ouGt81VolngaQgVN1i4+BbgrMULfARJdn6JPmaTATvbPB7h1C0eo83ob7CvayRzz
+gc0DxZZzJctsx+pzdKcxjTQNCyhir2pTL6sRJEnEyRFyuBlNpdpXAX2lTWg9VuCF
+G41im9g88M63NNc9YjQ7TUoY8A0mw4ytRacWT2bCdcqG/Zi4xl/lsbNIIT0R
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbYCFEUC0uwCdsbaaKKidfD+DMZvVOpOMA0GCSqGSIb3DQEBCwUAMBox
-GDAWBgNVBAMMD3NzLXYxLUJDLW5vdC1jQTAiGA8yMDE2MTEyNzAwMDAwMFoYDzIw
-MTkwMjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9zcy12MS1CQy1ub3QtY0EwggEiMA0G
+MIICzjCCAbYCFAez6sfgtC0WPxDGDAutGXWz99+vMA0GCSqGSIb3DQEBCwUAMBox
+GDAWBgNVBAMMD3NzLXYxLUJDLW5vdC1jQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
+MjAwMjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9zcy12MS1CQy1ub3QtY0EwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
 fs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1m
 CyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTM
 HGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m
 1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGj
-DTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBACPD97FQXIlcwGCPa7c4
-geJQtfcMkpBH0XjYJsiiU36SD1v4qGYhFA4Kwch3Xs0Lx/7JZk0Teo3IOL5a/Wcg
-VUDPnKP4rgjkZkIwPqFkADxt9Hnq3RxKS/YkrQadt7eJoVyhO1ZWnCXMNxwxTX4K
-GWeEszMxwmHFbzhyztB/4ehFo9fKn+fselZIZLP1NKNZa1PG+YO7XifdtDbGivio
-gY47Hctqm4lqZjViaPgu870DRxDsQwgZjmvPTmaYk5Ti5VpC8D+l70h1YI7B54bI
-YuvZoGtvOIILkj+MFEZ/pxorhVSK+TwipqY0y3hePkNK2y/b/A6tqUsPnmxtAWgi
-gF8=
+DTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAKvm8EuvPXYCZV03uXMj
+px2sByK+7SXNjia76G3/3z9wVhFLpOmIth7Qz819ai1df7VnKXERMzdPUC1W9kVc
+aVCFygN8YpzkfnfYtWVNt6gmMyBOdvPCaWx3H9xnJU548rp6RjAQQDJBgXwfHRLO
+RpZ1gD5pJK5CjIyd2jtiv4nIBkEhwXitThpTaky6YkOaAclVgvedBrPhstIbcHhL
+BEsXd723kDxi9gnBe30pC2zT3Y1OksZ4Bx2JOEq8dpPVJDNRtmb19/dP9XVyMSuv
+NkCnWkyEi5Whr1/mtkL2WhvzlS0sZQmYC6f+K47x4t/xQRuf8f4YAe5MMbO/AUpC
+WWk=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
@@ -1,17 +1,18 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ0CFG+xsjhAni9b1qourVzlGIf9wU4PMA0GCSqGSIb3DQEBCwUAMBUx
-EzARBgNVBAMMCnNzLXYxLW5vQkMwIhgPMjAxNjExMjcwMDAwMDBaGA8yMDE5MDIw
+MIICtTCCAZ0CFEmG6C/B8iwaI39vZ59gGsLRBtgyMA0GCSqGSIb3DQEBCwUAMBUx
+EzARBgNVBAMMCnNzLXYxLW5vQkMwIhgPMjAxNzExMjcwMDAwMDBaGA8yMDIwMDIw
 NTAwMDAwMFowFTETMBEGA1UEAwwKc3MtdjEtbm9CQzCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAQn35dNlGy5AZ7lB1ZDf6eSk0eM4V09+X4Rp8iYWxG15ZGozV+53b
-XPk87V0LUdqD3BwlSxC7P6suCqe+yxqyzXnIngbQ2XBUOBh5UKsDGt6innyV9hcN
-Gd6WJ5ab/TO8McgArPO9mJtFAK5ybS/27AemhJqwoWSkT+2V9Kvkhq3qVrmSybqm
-rA52l5nvs2L1R7efBGCXDhISE5nl2+dwJAlFm9tPPVBvgfQgkkxewdFu2Q4LtyIP
-5ib/+Y05iozm1fSJKa9aG29WcRy5tH9NZTzbKHXXLH4RQ4w0zdoPN+evdaCMP+X/
-uifzVtFgSv+535/ZuiTBrhK8M34O5M9RpQ==
+AQsFAAOCAQEACz0ZTMjLf9XThV1v01sdwxgsbGqvsqCii2NzGOD3WId0y5qxUTrP
+DDmcb5ALeHFX8n1kRvtdFsYub0AVP3pxYALVKQH/865BqYdkji/l5MfmD6C/pGMS
+uY5kkXdhhFxL67ISfmLGqZxyMrdmsDceVRXPF7Qr3FghE3/1UKxFf3obKdnlP9Cm
+emI2C5UWpvrtxzgLvbLY9+MXcr3L+0gR+4pDclQ4ndE6NWs6KewOeTro+A8NO3UI
+deyAZrZp8KSF/Gw+2kHYJedA7Pa16Njdjj1uih++rZ1dec0H8WEK4Jx47FgkiIpv
+IP7vmzONgplGkIm9Z4iA0P354+fUUfCfcA==
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbagAwIBAQIUFzQ8AN7jK1LnN/J/+S7wYBg78cswDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwIhgPMjAxNjExMjcwMDAwMDBaGA8y
-MDE5MDIwNTAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwggEiMA0GCSqG
+MIICzjCCAbagAwIBAQIUPZbOoWqnMoeCq+sty1vhq6I46dIwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwIhgPMjAxNzExMjcwMDAwMDBaGA8y
+MDIwMDIwNTAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAO
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBALLgDg90AkrJPZpwmw3s
-7xeEUwKiPnMthzsemMK7Lh9zTz5MQDJqszGX84yPkQMEgZqN6QgG6ZUq/vkoY3tO
-8PXPG5dqWrLgCb+l4I03xVmVCjTUPH+SJdFz6wt0UxVsK1cO8SfFKZHTw1KxelI2
-F0Sqpn6EgBZNMpSOxdoXJ9xOXOQFCKsnSvPsmaHTr3unjZ+/3AifTB8zKjampSxW
-3yn0+TArDoFuwsIf1WgY2LkbEuDB0B5AdUppPbZvHIB1QxENTAzW4Gq5u++tLeI6
-sJ/7TZrz/INYkxSa8Gp9zsZZEgDXxhuqcQ19I1uA726NyVUdd88FAeKODuJp2u7P
-vkQ=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKr53rXzbx3Vbu2CCkc1
+vDd4wz1XkTAJDZqm1mAkPXor5xX/4Jbj2xpP3HSmxMVNIPAWRFcSjWUgL0JXtPDo
+P5sycAoZlhN51y8xgJhimiD6j0MiwKs/f0J4fQfmAXnSZsIfKngMe0u3EDvT3JRT
+vh457s497PCmigiexzMaXw/BTSedCgvogIpa59BbEu/fAtunwv4tfhah/F67WH7W
+/5w9hi/MGwq3MT0qJtOLV8lfHoLE6TuxIW6XejuJtpK9s3BzpaCsrxm8YB9TO2TE
+EFzBEoSj9kaXAakTJUSMK69nMphA61zbgue/BZrIf2SsY0cnOVb3SeACiJm2P5MU
+hkU=
 -----END CERTIFICATE-----
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
+++ b/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
@@ -1,18 +1,19 @@
+/Users/jcjones/hg/mozilla-central/mach
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAQIUTS7k9mULGp4XUf1IN6JkTSPLs+4wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc3MtdjItQkMtbm90LWNBMCIYDzIwMTYxMTI3MDAwMDAw
-WhgPMjAxOTAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYyLUJDLW5vdC1jQTCC
+MIIC0zCCAbugAwIBAQIUIQtnJSZWtYhzLtcFuN9VhyJpnVgwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc3MtdjItQkMtbm90LWNBMCIYDzIwMTcxMTI3MDAwMDAw
+WhgPMjAyMDAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYyLUJDLW5vdC1jQTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8Hm