Merge mozilla-central to autoland. CLOSED TREE

--HG--
extra : amend_source : b2acdf86e0246bedfd4fdcf7f6fd8f97f547aee7

security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUbzB/rM58wfRs/0iuQ/xfzkc552cwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
-MjAwMjA1MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
+MIICxjCCAa6gAwIBAgIUBfk77Fo5elMy7K0NYjILz5SRXmMwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
+MjEwMjA0MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAA0xshP6sKTqR7yx83OV/xxLsGxyvx
-ngXTB5sTFIM2xTIRmJAYhsfdpGK3kICP5lnv5CyQYYJqT5jLuHQc14qg7XzJuwIj
-/LJtWZUhCj58ShZmwD81ZcXwaueNPZZnjlsT5dIM2zZeq+X1/VEYTtMDRij4LQZL
-1dvs41MFUcBzgGCGeYwst5kmlzoW/7WfWycWh7n0zru8Pe3w7g3CEOo46XQO92W3
-Qywx3meearX+KJiVamV1sB/Q90xZBlQoZqys3Pu9NSV6IHL80HMKejJmFk0tCCey
-Hu96t8+9or+896VorrPVyKsOGQB//CYa0MbUI33v4VdTWhRYBZHYqu80
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBU7zPKHTMnyOnLuZ3P+sVOFYsHzhH0
+HxBqYb++mdNCR696yCzUoJ/vwo0Yqb5tj2B5AhqCOFFR19Me+zSUvC96/9JjZtZO
+PdIxEJlPxqSdbB3jlg0+Zt8hGKkV0KIiBzD7m1+OBSW6Iq3MctgcfMsSfgwWLIty
+TS4Nip3duVotoahtnlYvb9eAySC4Qm2Q7q7d7UeqBa8imF70fpbUcsJxU87ovoAN
+3n5xCoYhA9SrOI0+wqme1n6l/BcHr6j9yBOCy39ufK+9R5R5lkxXwtFLfpvx7IxB
+Ze2MzOBvVOCCp6fP+JwQiUI6SPx5I1ajqDO6GceH1uRgfE34MZ7e89Sm
 -----END CERTIFICATE-----

security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICzDCCAbSgAwIBAgIUJeivZ4nTHueZ5ue0AaQ6VvCjJH4wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE3MTEyNzAwMDAwMFoYDzIw
-MjAwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
+MIICzDCCAbSgAwIBAgIUKW1x/LWEvI+H+Bu97XIU65FqGC0wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
+MjEwMjA0MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCHx0n9Qpu4JyQculxyyjHG
-qIecN8Yi2nPLP0i/cJia9F77XMIEDgpEXiIZh8ix7fYUt//6FVYHDjKKx7Vd5m07
-OzoXTw937cQFFwWFYuq8/Sh0ZAHe+UoJuv3GHqBADM/P/NcC/tNImuoO5RbxNQe2
-yySru42x5pXsmZIJ6SAna8HqDok4zBLwikO2NvU39dAzwjscGWJzzncHcuUaxop8
-DJPc2c4XmVQhVUcKbLZnWUYlDFS/OseHSAu2TpMCoL0ussTekkMoaEbnmTD1vZtx
-Ab/3xO9qgM30bREuHG1/PndAVYl9lQGIbNxLial9kQtkkjDuCOT9FPmnoBPDRZFc
+BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAFrKOzu81VAR+21n2fsSZ6
+x9zCa4wp8CHNqmFqaFrJWDFW4in/zNE2RgBCDy7qp4rPqZJa2KGWOBVzaKPFjDdj
+Yjx8h0FlJ80l04UduS2z+5MaA7rp/wm7VmBCk137D27Sec84Y3Lp/yHJZDJCjhtO
+K7MCMdVuHvbGlVCFhxXw+L8Xzf6hl+JxM5xHseNqOzWAm0EV2Rs8HFyYwNF4eykw
+9DxOhmq51m/TSfVPbkgpNGoVOypz528iqVbqgVmukentX67bvRCQWzn8983pQ1sm
+L6v/myWirO08USwGcUOhUfe9+KGWakW1Ngx+ejXRBHsD4iuV3P0H3Fgyd7fDooht
 -----END CERTIFICATE-----

security/manager/ssl/tests/unit/test_intermediate_preloads/ee.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5TCCAc2gAwIBAgIUKWcVgS9ewqHTZ/zYT3TVfz5E3GEwDQYJKoZIhvcNAQEL
+MIIC5TCCAc2gAwIBAgIUVVAO8Uf5rYcjJCKDIItgOHEvlB4wDQYJKoZIhvcNAQEL
 BQAwLzEtMCsGA1UEAwwkaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRp
-YXRlMCIYDzIwMTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMA0xCzAJBgNV
+YXRlMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMA0xCzAJBgNV
 BAMMAmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB
 /W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRx
 CHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMC
@@ -9,10 +9,10 @@ OosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdm
 Wqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGz
 ey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUD
 rNoYCjXtjQIDAQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
-AQsFAAOCAQEAfeCXPOT0iBdAdMMQsRLX/T4PjORcHCJE679gaaCH408zDnR5y4N1
-hXYhIqePF64Xj/CItUBjF5H29K0lsitkwAd5R0kdKo58ieBPAuo940u/aTgSWteb
-clDWDn2b3ACL+6N1nCB4t10yCq0xiUG0KYEntea7fNVoyzJCuo2BA+cZn+zdV8e4
-/bsG2oasvp3rAo72P+8fyhBdwJnL/pltAg+SgyyEDFrWhQwWcrLaq30AP0w0ItO+
-ctgVqlXDsWyVOTtxGKX7l6aoIyDZ8ypYKT/vDBdRD98kJO8JTLCB9D/+fqNIZ+RR
-oCsZYzAGCIQJQMy8AG3nELNnugutqPAarg==
+AQsFAAOCAQEAh7CcGVSCSRxV50oVY41dE54uvsC8HRMBklOaqzVxCCBmr4T0NyFA
+wElgf9FQtIQRUV1mL71l6PI9cT3AOVmX7LaUIoIaz+waxLYA0cYGozZ/cdyBLVHW
+QvA2vmrOr3oedjXr8ZvKmLVpWtb+VGPATilo7rZtDOBGGwZbBMXrZQ7BGJSrbyFv
++hLTifsG0opuauf1t8CfoVVMXAOOLHEv5JA/006gxMPtJCwCwrMSAZhjV4w6zB6g
+VJhroC9kz+aS5loUKz0RO3A+q2yqH9LsajtxenCkirjixHmLY0Y6sH+AjjEL4aH1
+4hXK8U7emOjfd03fA7CNcUT4zlbBxfca2w==
 -----END CERTIFICATE-----

security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5zCCAc+gAwIBAgIUP/k97g9sNmKzpKUGr6rLH9tuefIwDQYJKoZIhvcNAQEL
+MIIC5zCCAc+gAwIBAgIUW/Dnw/l4fff6/4XUH/s6OPogkW8wDQYJKoZIhvcNAQEL
 BQAwMDEuMCwGA1UEAwwlaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRp
-YXRlMjAiGA8yMDE3MTEyNzAwMDAwMFoYDzIwMjAwMjA1MDAwMDAwWjAOMQwwCgYD
+YXRlMjAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAOMQwwCgYD
 VQQDDANlZTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W
 1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtq
 ZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx
@@ -9,10 +9,10 @@ ZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx
 t2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo
 4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx
 1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3
-DQEBCwUAA4IBAQCvme71ToYWZRNZWpv3ug9kcH4//B5rmQvPRqJjf+TtBsO284MN
-avtknmZBkTOUtZvRIBZxa736s7pgtrs+3cx8K6ssyLh05fWl+FCtKyesu57njxb5
-Y6sNHh8AYkoC9RYFUHiQBZqW8KJENN57aP7iXffB9oQx7BNSv82Qmtb93YwDYmOu
-9UTKiIuvWJiu7wMOGllRzQ42F2E4V9HWTSEmsdyw7RjAknMZt34DU0GeAW18K+G9
-VYpXSTPiHcVYn9inuoWO1n7h84oJwJYx23sN9q79fcDGUWbNR4QqZ90yHBxw75Ts
-OSXMtREbIRZW5NnOc2fqwPgRootdyLQhoWuu
+DQEBCwUAA4IBAQC2OwW+8cJo6VAcy+usJ4ncfvOsMqCFD2KU8qX+IBhSKRY4vGrL
+2kkewzko2uuNyaIoLKqSHD3Z3tQ4LZ/C9NV0NzV3WkbqfWBF3YdY4U8Iw8VFprBF
+/AkcF722pHRAOEGAhYnTWeaK4BTRGmfxu1WsJyTcQVZoG4OpyX9Y0GlA3KADDi4/
++Vct/g6wRbVDohhiOWVPbBiCoTZ+lbEn9hf0ypmJx8G5QrfwkSmrxnDl/uwkSksU
+iP4GMC6pmyaUA2pW37aeEnho3IcKz7smY1qPieU1aSjXBaPIVWqk79ahQAiwztM/
+Tk0ffUfR1TC+28tLYeEEhnA1swMXQAYpE7a8
 -----END CERTIFICATE-----

security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIUTXfPu5ok43b8qQI8ttEhSBy8GA0wDQYJKoZIhvcNAQEL
+MIIDAzCCAeugAwIBAgIUSZHzRC3DhryQmCeA8McE+HkV420wDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctY2EwIhgPMjAx
-NzExMjcwMDAwMDBaGA8yMDIwMDIwNTAwMDAwMFowLzEtMCsGA1UEAwwkaW50ZXJt
+ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowLzEtMCsGA1UEAwwkaW50ZXJt
 ZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -9,11 +9,11 @@ qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAEZc5zgkFof6G
-/r2xV3++hfvwfMe2QwaDfb0fyyq2kLgDxT3c/AIWkSYw5WM3EplS7jNWeBPUEcQD
-cCuY7D34sVEFmmmY1rSd7BmVJMQ8dDkEr/v1wu+uDveRJIhDUpGRWPuml5AJUmR7
-qCZonfvtj5C5EkWX6LiqSf39RCWedShr9z8C68qdVmexD40svIet3SP0SJDrurOm
-KLJ0e7sw2jx19O6A3P7SB9cHsRUET2BRqR0BeHVqrWxHbujCPA2odKX+cA89Q1PF
-cUc5V9SWv6fHVr1Gy2hchPhBPY2Zu5gsn1AWpo+s5jMrbU4gfLiAufH4kqpeeFwc
-xG04TgZ9VA==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAqi23fLIijrII
+/ASwO9GsLz/0E6oExh7eUdlHAuB4XsT4VUqKPg756SjYBJlejOdjK303jERxoToQ
+4piA3/LajuG0ZuYHoZh/8RxKiagUCvDcN4Anso/MJfH+TMiJZrjhGf++KJEWZ41o
+b5W0ImIhyxIV2YSPhNYQkpINtFg+rgyzWEer81wYUpnaFSj9l+mNmfNFpoc400kw
+LQtcXDBC1OPE7r0CmHPq/CKNbVDcJqDQuZtbI3AHXeTeFClZRR+R9hlRoTrKklPK
+QDW2qEWJ4YVttaOQtc3YNo6zP4QR8ygb/djpu6af/M3FlNAzEks0bLBp9jvARQJf
+13ghJkPpxw==
 -----END CERTIFICATE-----

security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDBTCCAe2gAwIBAgIUIx42GCoUnPyFRd6qXriQSLixdjMwDQYJKoZIhvcNAQEL
+MIIDBTCCAe2gAwIBAgIUX8XYbAe9m9RmRft8BDZOTuIMgRMwDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctY2EyMCIYDzIw
-MTcxMTI3MDAwMDAwWhgPMjAyMDAyMDUwMDAwMDBaMDAxLjAsBgNVBAMMJWludGVy
+MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMDAxLjAsBgNVBAMMJWludGVy
 bWVkaWF0ZS1wcmVsb2FkaW5nLWludGVybWVkaWF0ZTIwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
@@ -9,11 +9,11 @@ KZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmI
 YXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7fi
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1Ud
-EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBjFei0ALlP
-HDJMW6ARi4cKunZ2FML0lkG+R9b92j5pWTvDy+1UZw4sZXMAFcujzs6mMNYL4/yO
-k5weX7c6hZkVTcZsqQHgnyvEwF80OEgmFpBQiDECsULnKF+Pu5rfeQmrJLBIB1pC
-VnF5C9BhkZGHW3Ic+U/r+0k8UKE5hpZ7QtNtyLdKDWIdD90hCBonhX3Jjk9NtY+T
-1qzGKg6Ldn2osLlUpJWZB6TOui62hoJvIBD14yVDVy3mPT/L5ueZ7GqpiqRh9qyG
-U2GmvnpAGGi28dUpScykXnONlhg45YXGm1usLcVFMRcU8DcekdXKQgCITbtQUg2i
-TV3KCNEAdyn8
+EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBLnXv+X/Ly
+FouMiHwrNlRkOTfttwRxTXnu9f4ZJ9Issf+blp5W1F2WlkNZTCBs0hOjrPrN6ofB
+0Wk5ZBpxhakC7YvOvOGLrNLg7TtJsnGLKQgQ6TM24hA5cNmaIBnk3hIgfAd6n2a0
+YRe3VwCU4V28ztTYNNVzNJcJIktJh5ODRQGJv8ZAwoKAM+O+pbYs29vE0i0T+SOi
+lNU6PoINUjKYs/JeaqSAxRpdgVIfuDKGbbfLhagqlhsk/m0tQeX74cd857S3Unk1
+F1+WOGcCKnMDMAEEKXWvgA58bM+81yRM4xxvFgY3W9X2dEnVODbVZs3XFCfeFcoW
+k1VX12pRYvBL
 -----END CERTIFICATE-----