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