Issue %3005 - Centralize the Security Features and locate them to system/security

1842 files changed, 56 insertions, 59 deletions

diff --git a/dom/base/moz.build b/dom/base/moz.build
index ab0568b3e..e64f26c8c 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -426,7 +426,6 @@ LOCAL_INCLUDES += [
     '../media',
     '../network',
     '../time',
-    '/caps',
     '/dom/base',
     '/dom/geolocation',
     '/dom/html',
@@ -449,10 +448,11 @@ LOCAL_INCLUDES += [
     '/layout/svg',
     '/layout/xul',
     '/netwerk/base',
-    '/security/manager/ssl',
     '/system/docshell/base',
     '/system/graphics/2d',
     '/system/interface',
+    '/system/security/manager/ssl',
+    '/system/security/script',
     '/xpcom/ds',
 ]
 
diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build
index 8ba3047bb..00dcc7397 100644
--- a/dom/crypto/moz.build
+++ b/dom/crypto/moz.build
@@ -26,8 +26,8 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/workers',
-    '/security/manager/ssl',
-    '/security/pkix/include',
+    '/system/security/manager/ssl',
+    '/system/security/pkix/include',
     '/xpcom/build',
 ]
 
diff --git a/dom/html/moz.build b/dom/html/moz.build
index 80eb65d0a..1c6d95cfe 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -219,7 +219,6 @@ EXTRA_COMPONENTS += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/dom/base',
     '/dom/canvas',
     '/dom/media/',
@@ -234,6 +233,7 @@ LOCAL_INCLUDES += [
     '/layout/xul',
     '/netwerk/base',
     '/system/docshell/base',
+    '/system/security/script',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/interfaces/security/moz.build b/dom/interfaces/security/moz.build
deleted file mode 100644
index 2765b9869..000000000
--- a/dom/interfaces/security/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIContentSecurityManager.idl',
-    'nsIContentSecurityPolicy.idl'
-]
-
-XPIDL_MODULE = 'dom_security'
-
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 72f4ed051..5eca1a284 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -100,7 +100,6 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin':
     ]
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/components/permissions/src',
     '/components/registry/src',
     '/dom/base',
@@ -109,7 +108,6 @@ LOCAL_INCLUDES += [
     '/dom/filesystem',
     '/dom/geolocation',
     '/dom/media/webspeech/synth/ipc',
-    '/dom/security',
     '/dom/storage',
     '/dom/workers',
     '/embedding/components/printingui/ipc',
@@ -122,6 +120,8 @@ LOCAL_INCLUDES += [
     '/system/graphics/2d',
     '/system/interface',
     '/system/runtime',
+    '/system/security/content',
+    '/system/security/script',
     '/xpcom/base',
     '/xpcom/threads',
 ]
diff --git a/dom/media/moz.build b/dom/media/moz.build
index cbe91c255..148fcdcc4 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -276,11 +276,11 @@ EXTRA_JS_MODULES.media += [
 ]
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/dom/base',
     '/layout/generic',
     '/layout/xul',
     '/netwerk/base',
+    '/system/security/script',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
diff --git a/dom/media/standalone/moz.build b/dom/media/standalone/moz.build
index 5ec7e82c2..58c9b8331 100644
--- a/dom/media/standalone/moz.build
+++ b/dom/media/standalone/moz.build
@@ -14,11 +14,11 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/dom/base',
     '/layout/generic',
     '/layout/xul',
     '/netwerk/base',
+    '/system/security/script',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
diff --git a/dom/moz.build b/dom/moz.build
index dfab62618..112d40584 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -20,7 +20,6 @@ interfaces = [
     'xbl',
     'xpath',
     'xul',
-    'security',
     'storage',
     'json',
     'offline',
@@ -66,7 +65,6 @@ DIRS += [
     'power',
     'push',
     'quota',
-    'security',
     'settings',
     'storage',
     'svg',
diff --git a/dom/quota/moz.build b/dom/quota/moz.build
index 97d961cb1..e55e21ee2 100644
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -51,7 +51,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../workers',
-    '/caps',
+    '/system/security/script',
 ]
 
 if CONFIG['GNU_CXX']:
diff --git a/dom/u2f/moz.build b/dom/u2f/moz.build
index 92edac66d..554d58881 100644
--- a/dom/u2f/moz.build
+++ b/dom/u2f/moz.build
@@ -22,8 +22,8 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/crypto',
-    '/security/manager/ssl',
-    '/security/pkix/include',
+    '/system/security/manager/ssl',
+    '/system/security/pkix/include',
 ]
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
\ No newline at end of file
diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/serviceworkers/mochitest.ini
index 29ac9e036..e20387ac0 100644
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -201,7 +201,7 @@ support-files =
   open_window/client.html
   lorem_script.js
   file_blob_response_worker.js
-  !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
+  !/system/security/content/test/cors/file_CrossSiteXHR_server.sjs
   !/dom/tests/mochitest/notification/MockServices.js
   !/dom/tests/mochitest/notification/NotificationTest.js
   blocking_install_event_worker.js
diff --git a/dom/xml/moz.build b/dom/xml/moz.build
index e40e18e49..ad29c0705 100644
--- a/dom/xml/moz.build
+++ b/dom/xml/moz.build
@@ -33,11 +33,11 @@ SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/dom/base',
     '/dom/html',
     '/dom/xul',
     '/layout/style',
+    '/system/security/script',
 ]
 
 RESOURCE_FILES.dtd += [
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
index 1ad2f3bf6..6c1c49721 100644
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -140,11 +140,11 @@ if CONFIG['_MSC_VER']:
     SOURCES['BackgroundParentImpl.cpp'].flags += ['-wd4312']
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/dom/broadcastchannel',
     '/dom/indexedDB',
     '/dom/workers',
     '/media/webrtc/trunk',
+    '/system/security/script',
     '/xpcom/build',
 ]
 
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index cc70fc986..d2d1c3b28 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -53,7 +53,6 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../loader',
     '../wrappers',
-    '/caps',
     '/dom/base',
     '/dom/bindings',
     '/dom/html',
@@ -61,6 +60,7 @@ LOCAL_INCLUDES += [
     '/dom/workers',
     '/layout/base',
     '/layout/style',
+    '/system/security/script',
     '/xpcom/reflect/xptinfo',
 ]
 
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 46723d1e0..ee5576e60 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -27,7 +27,6 @@ LOCAL_INCLUDES += [
     '../tables',
     '../view',
     '../xul',
-    '/caps',
     '/components/permissions/src',
     '/dom/audiochannel',
     '/dom/base',
@@ -57,6 +56,7 @@ LOCAL_INCLUDES += [
     '/netwerk/base',
     '/netwerk/cookie',
     '/system/docshell/base',
+    '/system/security/script',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/security/patches/README b/libs/nss/patches/README
index 788bf6a53..788bf6a53 100644
--- a/security/patches/README
+++ b/libs/nss/patches/README
diff --git a/mailnews/extensions/smime/src/moz.build b/mailnews/extensions/smime/src/moz.build
index b2e5e38e4..57b7f23eb 100644
--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -17,6 +17,6 @@ EXTRA_COMPONENTS += [
 FINAL_LIBRARY = 'mail'
 
 LOCAL_INCLUDES += [
-    '/security/manager/pki',
-    '/security/pkix/include'
+    '/system/security/manager/pki',
+    '/system/security/pkix/include'
 ]
diff --git a/mailnews/mime/src/moz.build b/mailnews/mime/src/moz.build
index cef91fea3..ec84f39f3 100644
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -70,9 +70,9 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-     '/security/certverifier',
-     '/security/manager/ssl',
-     '/security/pkix/include',
+     '/system/security/certverifier',
+     '/system/security/manager/ssl',
+     '/system/security/pkix/include',
 ]
 
 EXTRA_COMPONENTS += [
diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
index cfa7aa5f4..a89ee9757 100644
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -284,8 +284,8 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/netwerk/protocol/http',
     '/netwerk/socket',
-    '/security/pkix/include',
     '/system/docshell/base',
+    '/system/security/pkix/include',
 ]
 
 if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build
index 5747b614e..cd822148f 100644
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -32,8 +32,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/caps',
     '/components/jar/src',
     '/netwerk/base',
     '/netwerk/protocol/http',
+    '/system/security/script',
 ]
diff --git a/system/moz.build b/system/moz.build
index ed89b69cf..25fd714d1 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -7,6 +7,7 @@ DIRS += [
   'docshell',
   'graphics',
   'interface',
+  'security',
 ]
 
 DIRS += ['runtime']
diff --git a/security/apps/AppSignatureVerification.cpp b/system/security/apps/AppSignatureVerification.cpp
index aed0b70c1..aed0b70c1 100644
--- a/security/apps/AppSignatureVerification.cpp
+++ b/system/security/apps/AppSignatureVerification.cpp
diff --git a/security/apps/AppTrustDomain.cpp b/system/security/apps/AppTrustDomain.cpp
index 35be4ebd9..35be4ebd9 100644
--- a/security/apps/AppTrustDomain.cpp
+++ b/system/security/apps/AppTrustDomain.cpp
diff --git a/security/apps/AppTrustDomain.h b/system/security/apps/AppTrustDomain.h
index e4a8ec5e5..e4a8ec5e5 100644
--- a/security/apps/AppTrustDomain.h
+++ b/system/security/apps/AppTrustDomain.h
diff --git a/security/apps/addons-public.crt b/system/security/apps/addons-public.crt
index 6ab711b99..6ab711b99 100644
--- a/security/apps/addons-public.crt
+++ b/system/security/apps/addons-public.crt
diff --git a/security/apps/addons-stage.crt b/system/security/apps/addons-stage.crt
index 73e48cadf..73e48cadf 100644
--- a/security/apps/addons-stage.crt
+++ b/system/security/apps/addons-stage.crt
diff --git a/security/apps/gen_cert_header.py b/system/security/apps/gen_cert_header.py
index 0ffe25cf4..0ffe25cf4 100644
--- a/security/apps/gen_cert_header.py
+++ b/system/security/apps/gen_cert_header.py
diff --git a/security/apps/marketplace-dev-public.crt b/system/security/apps/marketplace-dev-public.crt
index 490b8682b..490b8682b 100644
--- a/security/apps/marketplace-dev-public.crt
+++ b/system/security/apps/marketplace-dev-public.crt
diff --git a/security/apps/marketplace-dev-reviewers.crt b/system/security/apps/marketplace-dev-reviewers.crt
index 5b8bde933..5b8bde933 100644
--- a/security/apps/marketplace-dev-reviewers.crt
+++ b/system/security/apps/marketplace-dev-reviewers.crt
diff --git a/security/apps/marketplace-prod-public.crt b/system/security/apps/marketplace-prod-public.crt
index 85c2fed92..85c2fed92 100644
--- a/security/apps/marketplace-prod-public.crt
+++ b/system/security/apps/marketplace-prod-public.crt
diff --git a/security/apps/marketplace-prod-reviewers.crt b/system/security/apps/marketplace-prod-reviewers.crt
index 53be8c81e..53be8c81e 100644
--- a/security/apps/marketplace-prod-reviewers.crt
+++ b/system/security/apps/marketplace-prod-reviewers.crt
diff --git a/security/apps/marketplace-stage.crt b/system/security/apps/marketplace-stage.crt
index 84504f357..84504f357 100644
--- a/security/apps/marketplace-stage.crt
+++ b/system/security/apps/marketplace-stage.crt
diff --git a/security/apps/moz.build b/system/security/apps/moz.build
index 365379881..c8fb14faa 100644
--- a/security/apps/moz.build
+++ b/system/security/apps/moz.build
@@ -11,16 +11,16 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/security/certverifier',
-    '/security/manager/ssl',
-    '/security/pkix/include',
+    '../certverifier',
+    '../manager/ssl',
+    '../pkix/include',
 ]
 
 DEFINES['NSS_ENABLE_ECC'] = 'True'
 for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
-test_ssl_path = '/security/manager/ssl/tests/unit'
+test_ssl_path = '/system/security/manager/ssl/tests/unit'
 
 headers_arrays_certs = [
     ('marketplace-prod-public.inc', 'marketplaceProdPublicRoot', 'marketplace-prod-public.crt'),
diff --git a/security/apps/privileged-package-root.der b/system/security/apps/privileged-package-root.der
index 9f77af582..9f77af582 100644
--- a/security/apps/privileged-package-root.der
+++ b/system/security/apps/privileged-package-root.der
diff --git a/security/apps/trusted-app-public.der b/system/security/apps/trusted-app-public.der
index e69de29bb..e69de29bb 100644
--- a/security/apps/trusted-app-public.der
+++ b/system/security/apps/trusted-app-public.der
diff --git a/security/certverifier/BRNameMatchingPolicy.cpp b/system/security/certverifier/BRNameMatchingPolicy.cpp
index 68a2e90c0..68a2e90c0 100644
--- a/security/certverifier/BRNameMatchingPolicy.cpp
+++ b/system/security/certverifier/BRNameMatchingPolicy.cpp
diff --git a/security/certverifier/BRNameMatchingPolicy.h b/system/security/certverifier/BRNameMatchingPolicy.h
index 42d0a69b4..42d0a69b4 100644
--- a/security/certverifier/BRNameMatchingPolicy.h
+++ b/system/security/certverifier/BRNameMatchingPolicy.h
diff --git a/security/certverifier/CNNICHashWhitelist.inc b/system/security/certverifier/CNNICHashWhitelist.inc
index ed4149f1c..ed4149f1c 100644
--- a/security/certverifier/CNNICHashWhitelist.inc
+++ b/system/security/certverifier/CNNICHashWhitelist.inc
diff --git a/security/certverifier/CTKnownLogs.h b/system/security/certverifier/CTKnownLogs.h
index be49d9653..be49d9653 100644
--- a/security/certverifier/CTKnownLogs.h
+++ b/system/security/certverifier/CTKnownLogs.h
diff --git a/security/certverifier/CTLogVerifier.cpp b/system/security/certverifier/CTLogVerifier.cpp
index 202e4b4ac..202e4b4ac 100644
--- a/security/certverifier/CTLogVerifier.cpp
+++ b/system/security/certverifier/CTLogVerifier.cpp
diff --git a/security/certverifier/CTLogVerifier.h b/system/security/certverifier/CTLogVerifier.h
index 621761007..621761007 100644
--- a/security/certverifier/CTLogVerifier.h
+++ b/system/security/certverifier/CTLogVerifier.h
diff --git a/security/certverifier/CTObjectsExtractor.cpp b/system/security/certverifier/CTObjectsExtractor.cpp
index 6182969c0..6182969c0 100644
--- a/security/certverifier/CTObjectsExtractor.cpp
+++ b/system/security/certverifier/CTObjectsExtractor.cpp
diff --git a/security/certverifier/CTObjectsExtractor.h b/system/security/certverifier/CTObjectsExtractor.h
index 7b36a631c..7b36a631c 100644
--- a/security/certverifier/CTObjectsExtractor.h
+++ b/system/security/certverifier/CTObjectsExtractor.h
diff --git a/security/certverifier/CTSerialization.cpp b/system/security/certverifier/CTSerialization.cpp
index e58778835..e58778835 100644
--- a/security/certverifier/CTSerialization.cpp
+++ b/system/security/certverifier/CTSerialization.cpp
diff --git a/security/certverifier/CTSerialization.h b/system/security/certverifier/CTSerialization.h
index 9fa45731e..9fa45731e 100644
--- a/security/certverifier/CTSerialization.h
+++ b/system/security/certverifier/CTSerialization.h
diff --git a/security/certverifier/CTVerifyResult.cpp b/system/security/certverifier/CTVerifyResult.cpp
index d4815b621..d4815b621 100644
--- a/security/certverifier/CTVerifyResult.cpp
+++ b/system/security/certverifier/CTVerifyResult.cpp
diff --git a/security/certverifier/CTVerifyResult.h b/system/security/certverifier/CTVerifyResult.h
index 8cf998dc1..8cf998dc1 100644
--- a/security/certverifier/CTVerifyResult.h
+++ b/system/security/certverifier/CTVerifyResult.h
diff --git a/security/certverifier/CertVerifier.cpp b/system/security/certverifier/CertVerifier.cpp
index e2ff7b55c..e2ff7b55c 100644
--- a/security/certverifier/CertVerifier.cpp
+++ b/system/security/certverifier/CertVerifier.cpp
diff --git a/security/certverifier/CertVerifier.h b/system/security/certverifier/CertVerifier.h
index 174562091..174562091 100644
--- a/security/certverifier/CertVerifier.h
+++ b/system/security/certverifier/CertVerifier.h
diff --git a/security/certverifier/ExtendedValidation.cpp b/system/security/certverifier/ExtendedValidation.cpp
index 37c028c54..37c028c54 100644
--- a/security/certverifier/ExtendedValidation.cpp
+++ b/system/security/certverifier/ExtendedValidation.cpp
diff --git a/security/certverifier/ExtendedValidation.h b/system/security/certverifier/ExtendedValidation.h
index 0b84dcec0..0b84dcec0 100644
--- a/security/certverifier/ExtendedValidation.h
+++ b/system/security/certverifier/ExtendedValidation.h
diff --git a/security/certverifier/MultiLogCTVerifier.cpp b/system/security/certverifier/MultiLogCTVerifier.cpp
index 4c3248f91..4c3248f91 100644
--- a/security/certverifier/MultiLogCTVerifier.cpp
+++ b/system/security/certverifier/MultiLogCTVerifier.cpp
diff --git a/security/certverifier/MultiLogCTVerifier.h b/system/security/certverifier/MultiLogCTVerifier.h
index 49277d18b..49277d18b 100644
--- a/security/certverifier/MultiLogCTVerifier.h
+++ b/system/security/certverifier/MultiLogCTVerifier.h
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/system/security/certverifier/NSSCertDBTrustDomain.cpp
index 1e4bbf34b..1e4bbf34b 100644
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
+++ b/system/security/certverifier/NSSCertDBTrustDomain.cpp
diff --git a/security/certverifier/NSSCertDBTrustDomain.h b/system/security/certverifier/NSSCertDBTrustDomain.h
index e01e9cd68..e01e9cd68 100644
--- a/security/certverifier/NSSCertDBTrustDomain.h
+++ b/system/security/certverifier/NSSCertDBTrustDomain.h
diff --git a/security/certverifier/OCSPCache.cpp b/system/security/certverifier/OCSPCache.cpp
index c902be97b..c902be97b 100644
--- a/security/certverifier/OCSPCache.cpp
+++ b/system/security/certverifier/OCSPCache.cpp
diff --git a/security/certverifier/OCSPCache.h b/system/security/certverifier/OCSPCache.h
index b02ea6866..b02ea6866 100644
--- a/security/certverifier/OCSPCache.h
+++ b/system/security/certverifier/OCSPCache.h
diff --git a/security/certverifier/OCSPRequestor.cpp b/system/security/certverifier/OCSPRequestor.cpp
index 42fbf9cb3..42fbf9cb3 100644
--- a/security/certverifier/OCSPRequestor.cpp
+++ b/system/security/certverifier/OCSPRequestor.cpp
diff --git a/security/certverifier/OCSPRequestor.h b/system/security/certverifier/OCSPRequestor.h
index d6e460e82..d6e460e82 100644
--- a/security/certverifier/OCSPRequestor.h
+++ b/system/security/certverifier/OCSPRequestor.h
diff --git a/security/certverifier/OCSPVerificationTrustDomain.cpp b/system/security/certverifier/OCSPVerificationTrustDomain.cpp
index f56d685ea..f56d685ea 100644
--- a/security/certverifier/OCSPVerificationTrustDomain.cpp
+++ b/system/security/certverifier/OCSPVerificationTrustDomain.cpp
diff --git a/security/certverifier/OCSPVerificationTrustDomain.h b/system/security/certverifier/OCSPVerificationTrustDomain.h
index c3cbf108a..c3cbf108a 100644
--- a/security/certverifier/OCSPVerificationTrustDomain.h
+++ b/system/security/certverifier/OCSPVerificationTrustDomain.h
diff --git a/security/certverifier/SignedCertificateTimestamp.cpp b/system/security/certverifier/SignedCertificateTimestamp.cpp
index c556ee3e9..c556ee3e9 100644
--- a/security/certverifier/SignedCertificateTimestamp.cpp
+++ b/system/security/certverifier/SignedCertificateTimestamp.cpp
diff --git a/security/certverifier/SignedCertificateTimestamp.h b/system/security/certverifier/SignedCertificateTimestamp.h
index 468ffbade..468ffbade 100644
--- a/security/certverifier/SignedCertificateTimestamp.h
+++ b/system/security/certverifier/SignedCertificateTimestamp.h
diff --git a/security/certverifier/SignedTreeHead.h b/system/security/certverifier/SignedTreeHead.h
index 7c73a09e3..7c73a09e3 100644
--- a/security/certverifier/SignedTreeHead.h
+++ b/system/security/certverifier/SignedTreeHead.h
diff --git a/security/certverifier/StartComAndWoSignData.inc b/system/security/certverifier/StartComAndWoSignData.inc
index 3ba643397..3ba643397 100644
--- a/security/certverifier/StartComAndWoSignData.inc
+++ b/system/security/certverifier/StartComAndWoSignData.inc
diff --git a/security/certverifier/moz.build b/system/security/certverifier/moz.build
index 23063917a..340ca638d 100644
--- a/security/certverifier/moz.build
+++ b/system/security/certverifier/moz.build
@@ -33,8 +33,8 @@ if not CONFIG['NSS_NO_EV_CERTS']:
     ]
 
 LOCAL_INCLUDES += [
-    '/security/manager/ssl',
-    '/security/pkix/include',
+    '../manager/ssl',
+    '../pkix/include',
 ]
 
 DIRS += [
diff --git a/security/certverifier/tests/gtest/CTLogVerifierTest.cpp b/system/security/certverifier/tests/gtest/CTLogVerifierTest.cpp
index 2201cfc5d..2201cfc5d 100644
--- a/security/certverifier/tests/gtest/CTLogVerifierTest.cpp
+++ b/system/security/certverifier/tests/gtest/CTLogVerifierTest.cpp
diff --git a/security/certverifier/tests/gtest/CTObjectsExtractorTest.cpp b/system/security/certverifier/tests/gtest/CTObjectsExtractorTest.cpp
index 243dd62e3..243dd62e3 100644
--- a/security/certverifier/tests/gtest/CTObjectsExtractorTest.cpp
+++ b/system/security/certverifier/tests/gtest/CTObjectsExtractorTest.cpp
diff --git a/security/certverifier/tests/gtest/CTSerializationTest.cpp b/system/security/certverifier/tests/gtest/CTSerializationTest.cpp
index 88fc7b039..88fc7b039 100644
--- a/security/certverifier/tests/gtest/CTSerializationTest.cpp
+++ b/system/security/certverifier/tests/gtest/CTSerializationTest.cpp
diff --git a/security/certverifier/tests/gtest/CTTestUtils.cpp b/system/security/certverifier/tests/gtest/CTTestUtils.cpp
index 463f242b7..463f242b7 100644
--- a/security/certverifier/tests/gtest/CTTestUtils.cpp
+++ b/system/security/certverifier/tests/gtest/CTTestUtils.cpp
diff --git a/security/certverifier/tests/gtest/CTTestUtils.h b/system/security/certverifier/tests/gtest/CTTestUtils.h
index 10377b2db..10377b2db 100644
--- a/security/certverifier/tests/gtest/CTTestUtils.h
+++ b/system/security/certverifier/tests/gtest/CTTestUtils.h
diff --git a/security/certverifier/tests/gtest/MultiLogCTVerifierTest.cpp b/system/security/certverifier/tests/gtest/MultiLogCTVerifierTest.cpp
index 241847b17..241847b17 100644
--- a/security/certverifier/tests/gtest/MultiLogCTVerifierTest.cpp
+++ b/system/security/certverifier/tests/gtest/MultiLogCTVerifierTest.cpp
diff --git a/security/certverifier/tests/gtest/moz.build b/system/security/certverifier/tests/gtest/moz.build
index cb37089cb..cb37089cb 100644
--- a/security/certverifier/tests/gtest/moz.build
+++ b/system/security/certverifier/tests/gtest/moz.build
diff --git a/dom/security/ContentVerifier.cpp b/system/security/content/ContentVerifier.cpp
index 2d3fadea8..2d3fadea8 100644
--- a/dom/security/ContentVerifier.cpp
+++ b/system/security/content/ContentVerifier.cpp
diff --git a/dom/security/ContentVerifier.h b/system/security/content/ContentVerifier.h
index e0c940197..e0c940197 100644
--- a/dom/security/ContentVerifier.h
+++ b/system/security/content/ContentVerifier.h
diff --git a/dom/security/SRICheck.cpp b/system/security/content/SRICheck.cpp
index 7c3f8c7aa..7c3f8c7aa 100644
--- a/dom/security/SRICheck.cpp
+++ b/system/security/content/SRICheck.cpp
diff --git a/dom/security/SRICheck.h b/system/security/content/SRICheck.h
index 947fb9541..947fb9541 100644
--- a/dom/security/SRICheck.h
+++ b/system/security/content/SRICheck.h
diff --git a/dom/security/SRILogHelper.h b/system/security/content/SRILogHelper.h
index bbfd46bbf..bbfd46bbf 100644
--- a/dom/security/SRILogHelper.h
+++ b/system/security/content/SRILogHelper.h
diff --git a/dom/security/SRIMetadata.cpp b/system/security/content/SRIMetadata.cpp
index f81092704..f81092704 100644
--- a/dom/security/SRIMetadata.cpp
+++ b/system/security/content/SRIMetadata.cpp
diff --git a/dom/security/SRIMetadata.h b/system/security/content/SRIMetadata.h
index 3802d78c6..3802d78c6 100644
--- a/dom/security/SRIMetadata.h
+++ b/system/security/content/SRIMetadata.h
diff --git a/dom/security/moz.build b/system/security/content/moz.build
index a106216dc..af4beee9f 100644
--- a/dom/security/moz.build
+++ b/system/security/content/moz.build
@@ -5,6 +5,13 @@
 
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'nsIContentSecurityManager.idl',
+    'nsIContentSecurityPolicy.idl'
+]
+
+XPIDL_MODULE = 'dom_security'
+
 EXPORTS.mozilla.dom += [
     'ContentVerifier.h',
     'nsContentSecurityManager.h',
@@ -41,8 +48,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/caps',
     '/netwerk/base',
+    '/system/security/script',
 ]
 
 if CONFIG['GNU_CC']:
diff --git a/dom/security/nsCSPContext.cpp b/system/security/content/nsCSPContext.cpp
index ec698b91d..ec698b91d 100644
--- a/dom/security/nsCSPContext.cpp
+++ b/system/security/content/nsCSPContext.cpp
diff --git a/dom/security/nsCSPContext.h b/system/security/content/nsCSPContext.h
index 3530c74c5..3530c74c5 100644
--- a/dom/security/nsCSPContext.h
+++ b/system/security/content/nsCSPContext.h
diff --git a/dom/security/nsCSPParser.cpp b/system/security/content/nsCSPParser.cpp
index 12dcb9dc4..12dcb9dc4 100644
--- a/dom/security/nsCSPParser.cpp
+++ b/system/security/content/nsCSPParser.cpp
diff --git a/dom/security/nsCSPParser.h b/system/security/content/nsCSPParser.h
index 03ef2bb41..03ef2bb41 100644
--- a/dom/security/nsCSPParser.h
+++ b/system/security/content/nsCSPParser.h
diff --git a/dom/security/nsCSPService.cpp b/system/security/content/nsCSPService.cpp
index 5e5066b73..5e5066b73 100644
--- a/dom/security/nsCSPService.cpp
+++ b/system/security/content/nsCSPService.cpp
diff --git a/dom/security/nsCSPService.h b/system/security/content/nsCSPService.h
index e9c82d438..e9c82d438 100644
--- a/dom/security/nsCSPService.h
+++ b/system/security/content/nsCSPService.h
diff --git a/dom/security/nsCSPUtils.cpp b/system/security/content/nsCSPUtils.cpp
index 5f0bac1cd..5f0bac1cd 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/system/security/content/nsCSPUtils.cpp
diff --git a/dom/security/nsCSPUtils.h b/system/security/content/nsCSPUtils.h
index 84dcbb7fc..84dcbb7fc 100644
--- a/dom/security/nsCSPUtils.h
+++ b/system/security/content/nsCSPUtils.h
diff --git a/dom/security/nsContentSecurityManager.cpp b/system/security/content/nsContentSecurityManager.cpp
index d33f962ec..d33f962ec 100644
--- a/dom/security/nsContentSecurityManager.cpp
+++ b/system/security/content/nsContentSecurityManager.cpp
diff --git a/dom/security/nsContentSecurityManager.h b/system/security/content/nsContentSecurityManager.h
index 0451f643b..0451f643b 100644
--- a/dom/security/nsContentSecurityManager.h
+++ b/system/security/content/nsContentSecurityManager.h
diff --git a/dom/interfaces/security/nsIContentSecurityManager.idl b/system/security/content/nsIContentSecurityManager.idl
index 1a1c91021..1a1c91021 100644
--- a/dom/interfaces/security/nsIContentSecurityManager.idl
+++ b/system/security/content/nsIContentSecurityManager.idl
diff --git a/dom/interfaces/security/nsIContentSecurityPolicy.idl b/system/security/content/nsIContentSecurityPolicy.idl
index da4297f33..da4297f33 100644
--- a/dom/interfaces/security/nsIContentSecurityPolicy.idl
+++ b/system/security/content/nsIContentSecurityPolicy.idl
diff --git a/dom/security/nsMixedContentBlocker.cpp b/system/security/content/nsMixedContentBlocker.cpp
index 031bc27db..031bc27db 100644
--- a/dom/security/nsMixedContentBlocker.cpp
+++ b/system/security/content/nsMixedContentBlocker.cpp
diff --git a/dom/security/nsMixedContentBlocker.h b/system/security/content/nsMixedContentBlocker.h
index 6d343fba0..6d343fba0 100644
--- a/dom/security/nsMixedContentBlocker.h
+++ b/system/security/content/nsMixedContentBlocker.h
diff --git a/dom/security/test/contentverifier/browser.ini b/system/security/content/test/contentverifier/browser.ini
index c41c2e8e8..c41c2e8e8 100644
--- a/dom/security/test/contentverifier/browser.ini
+++ b/system/security/content/test/contentverifier/browser.ini
diff --git a/dom/security/test/contentverifier/browser_verify_content_about_newtab.js b/system/security/content/test/contentverifier/browser_verify_content_about_newtab.js
index f63726ef8..f63726ef8 100644
--- a/dom/security/test/contentverifier/browser_verify_content_about_newtab.js
+++ b/system/security/content/test/contentverifier/browser_verify_content_about_newtab.js
diff --git a/dom/security/test/contentverifier/browser_verify_content_about_newtab2.js b/system/security/content/test/contentverifier/browser_verify_content_about_newtab2.js
index a35ff6660..a35ff6660 100644
--- a/dom/security/test/contentverifier/browser_verify_content_about_newtab2.js
+++ b/system/security/content/test/contentverifier/browser_verify_content_about_newtab2.js
diff --git a/dom/security/test/contentverifier/file_about_newtab.html b/system/security/content/test/contentverifier/file_about_newtab.html
index f274743b9..f274743b9 100644
--- a/dom/security/test/contentverifier/file_about_newtab.html
+++ b/system/security/content/test/contentverifier/file_about_newtab.html
diff --git a/dom/security/test/contentverifier/file_about_newtab_bad.html b/system/security/content/test/contentverifier/file_about_newtab_bad.html
index 45899f4f4..45899f4f4 100644
--- a/dom/security/test/contentverifier/file_about_newtab_bad.html
+++ b/system/security/content/test/contentverifier/file_about_newtab_bad.html
diff --git a/dom/security/test/contentverifier/file_about_newtab_bad_csp.html b/system/security/content/test/contentverifier/file_about_newtab_bad_csp.html
index f8044b73f..f8044b73f 100644
--- a/dom/security/test/contentverifier/file_about_newtab_bad_csp.html
+++ b/system/security/content/test/contentverifier/file_about_newtab_bad_csp.html
diff --git a/dom/security/test/contentverifier/file_about_newtab_bad_csp_signature b/system/security/content/test/contentverifier/file_about_newtab_bad_csp_signature
index ded42dc9f..ded42dc9f 100644
--- a/dom/security/test/contentverifier/file_about_newtab_bad_csp_signature
+++ b/system/security/content/test/contentverifier/file_about_newtab_bad_csp_signature
diff --git a/dom/security/test/contentverifier/file_about_newtab_bad_signature b/system/security/content/test/contentverifier/file_about_newtab_bad_signature
index 73a3c1e34..73a3c1e34 100644
--- a/dom/security/test/contentverifier/file_about_newtab_bad_signature
+++ b/system/security/content/test/contentverifier/file_about_newtab_bad_signature
diff --git a/dom/security/test/contentverifier/file_about_newtab_broken_signature b/system/security/content/test/contentverifier/file_about_newtab_broken_signature
index 468a167ff..468a167ff 100644
--- a/dom/security/test/contentverifier/file_about_newtab_broken_signature
+++ b/system/security/content/test/contentverifier/file_about_newtab_broken_signature
diff --git a/dom/security/test/contentverifier/file_about_newtab_good_signature b/system/security/content/test/contentverifier/file_about_newtab_good_signature
index d826d49c3..d826d49c3 100644
--- a/dom/security/test/contentverifier/file_about_newtab_good_signature
+++ b/system/security/content/test/contentverifier/file_about_newtab_good_signature
diff --git a/dom/security/test/contentverifier/file_about_newtab_sri.html b/system/security/content/test/contentverifier/file_about_newtab_sri.html
index 4415c533a..4415c533a 100644
--- a/dom/security/test/contentverifier/file_about_newtab_sri.html
+++ b/system/security/content/test/contentverifier/file_about_newtab_sri.html
diff --git a/dom/security/test/contentverifier/file_about_newtab_sri_signature b/system/security/content/test/contentverifier/file_about_newtab_sri_signature
index b7ac17944..b7ac17944 100644
--- a/dom/security/test/contentverifier/file_about_newtab_sri_signature
+++ b/system/security/content/test/contentverifier/file_about_newtab_sri_signature
diff --git a/dom/security/test/contentverifier/file_contentserver.sjs b/system/security/content/test/contentverifier/file_contentserver.sjs
index 3ea49cdde..3ea49cdde 100644
--- a/dom/security/test/contentverifier/file_contentserver.sjs
+++ b/system/security/content/test/contentverifier/file_contentserver.sjs
diff --git a/dom/security/test/contentverifier/goodChain.pem b/system/security/content/test/contentverifier/goodChain.pem
index d5047cfc2..d5047cfc2 100644
--- a/dom/security/test/contentverifier/goodChain.pem
+++ b/system/security/content/test/contentverifier/goodChain.pem
diff --git a/dom/security/test/contentverifier/head.js b/system/security/content/test/contentverifier/head.js
index d9637d18b..d9637d18b 100644
--- a/dom/security/test/contentverifier/head.js
+++ b/system/security/content/test/contentverifier/head.js
diff --git a/dom/security/test/contentverifier/script.js b/system/security/content/test/contentverifier/script.js
index 8fd8f96b2..8fd8f96b2 100644
--- a/dom/security/test/contentverifier/script.js
+++ b/system/security/content/test/contentverifier/script.js
diff --git a/dom/security/test/contentverifier/signature.der b/system/security/content/test/contentverifier/signature.der
index 011b94142..011b94142 100644
--- a/dom/security/test/contentverifier/signature.der
+++ b/system/security/content/test/contentverifier/signature.der
diff --git a/dom/security/test/contentverifier/sk.pem b/system/security/content/test/contentverifier/sk.pem
index 2ed514b9f..2ed514b9f 100644
--- a/dom/security/test/contentverifier/sk.pem
+++ b/system/security/content/test/contentverifier/sk.pem
diff --git a/dom/security/test/contentverifier/style.css b/system/security/content/test/contentverifier/style.css
index c7ab9ecff..c7ab9ecff 100644
--- a/dom/security/test/contentverifier/style.css
+++ b/system/security/content/test/contentverifier/style.css
diff --git a/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs b/system/security/content/test/cors/file_CrossSiteXHR_cache_server.sjs
index 8ee4ddbf5..8ee4ddbf5 100644
--- a/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs
+++ b/system/security/content/test/cors/file_CrossSiteXHR_cache_server.sjs
diff --git a/dom/security/test/cors/file_CrossSiteXHR_inner.html b/system/security/content/test/cors/file_CrossSiteXHR_inner.html
index 9268f0ed7..9268f0ed7 100644
--- a/dom/security/test/cors/file_CrossSiteXHR_inner.html
+++ b/system/security/content/test/cors/file_CrossSiteXHR_inner.html
diff --git a/dom/security/test/cors/file_CrossSiteXHR_inner.jar b/system/security/content/test/cors/file_CrossSiteXHR_inner.jar
index bdb0eb440..bdb0eb440 100644
--- a/dom/security/test/cors/file_CrossSiteXHR_inner.jar
+++ b/system/security/content/test/cors/file_CrossSiteXHR_inner.jar
diff --git a/dom/security/test/cors/file_CrossSiteXHR_inner_data.sjs b/system/security/content/test/cors/file_CrossSiteXHR_inner_data.sjs
index 2908921e2..2908921e2 100644
--- a/dom/security/test/cors/file_CrossSiteXHR_inner_data.sjs
+++ b/system/security/content/test/cors/file_CrossSiteXHR_inner_data.sjs
diff --git a/dom/security/test/cors/file_CrossSiteXHR_server.sjs b/system/security/content/test/cors/file_CrossSiteXHR_server.sjs
index 66d110468..66d110468 100644
--- a/dom/security/test/cors/file_CrossSiteXHR_server.sjs
+++ b/system/security/content/test/cors/file_CrossSiteXHR_server.sjs
diff --git a/dom/security/test/cors/mochitest.ini b/system/security/content/test/cors/mochitest.ini
index 095b0d09d..095b0d09d 100644
--- a/dom/security/test/cors/mochitest.ini
+++ b/system/security/content/test/cors/mochitest.ini
diff --git a/dom/security/test/cors/test_CrossSiteXHR.html b/system/security/content/test/cors/test_CrossSiteXHR.html
index d9aef5c60..d9aef5c60 100644
--- a/dom/security/test/cors/test_CrossSiteXHR.html
+++ b/system/security/content/test/cors/test_CrossSiteXHR.html
diff --git a/dom/security/test/cors/test_CrossSiteXHR_cache.html b/system/security/content/test/cors/test_CrossSiteXHR_cache.html
index 3252eff4a..3252eff4a 100644
--- a/dom/security/test/cors/test_CrossSiteXHR_cache.html
+++ b/system/security/content/test/cors/test_CrossSiteXHR_cache.html
diff --git a/dom/security/test/cors/test_CrossSiteXHR_origin.html b/system/security/content/test/cors/test_CrossSiteXHR_origin.html
index 1012ae593..1012ae593 100644
--- a/dom/security/test/cors/test_CrossSiteXHR_origin.html
+++ b/system/security/content/test/cors/test_CrossSiteXHR_origin.html
diff --git a/dom/security/test/csp/browser.ini b/system/security/content/test/csp/browser.ini
index 0846e87fe..0846e87fe 100644
--- a/dom/security/test/csp/browser.ini
+++ b/system/security/content/test/csp/browser.ini
diff --git a/dom/security/test/csp/browser_manifest-src-override-default-src.js b/system/security/content/test/csp/browser_manifest-src-override-default-src.js
index 0c4c7b7bc..0c4c7b7bc 100644
--- a/dom/security/test/csp/browser_manifest-src-override-default-src.js
+++ b/system/security/content/test/csp/browser_manifest-src-override-default-src.js
diff --git a/dom/security/test/csp/browser_test_web_manifest.js b/system/security/content/test/csp/browser_test_web_manifest.js
index df23770ba..df23770ba 100644
--- a/dom/security/test/csp/browser_test_web_manifest.js
+++ b/system/security/content/test/csp/browser_test_web_manifest.js
diff --git a/dom/security/test/csp/browser_test_web_manifest_mixed_content.js b/system/security/content/test/csp/browser_test_web_manifest_mixed_content.js
index 9238acbcd..9238acbcd 100644
--- a/dom/security/test/csp/browser_test_web_manifest_mixed_content.js
+++ b/system/security/content/test/csp/browser_test_web_manifest_mixed_content.js
diff --git a/dom/security/test/csp/file_CSP.css b/system/security/content/test/csp/file_CSP.css
index 6835c4d4a..6835c4d4a 100644
--- a/dom/security/test/csp/file_CSP.css
+++ b/system/security/content/test/csp/file_CSP.css
diff --git a/dom/security/test/csp/file_CSP.sjs b/system/security/content/test/csp/file_CSP.sjs
index 85c2df3ba..85c2df3ba 100644
--- a/dom/security/test/csp/file_CSP.sjs
+++ b/system/security/content/test/csp/file_CSP.sjs
diff --git a/dom/security/test/csp/file_allow_https_schemes.html b/system/security/content/test/csp/file_allow_https_schemes.html
index 787e683e8..787e683e8 100644
--- a/dom/security/test/csp/file_allow_https_schemes.html
+++ b/system/security/content/test/csp/file_allow_https_schemes.html
diff --git a/dom/security/test/csp/file_base_uri_server.sjs b/system/security/content/test/csp/file_base_uri_server.sjs
index dfba2a061..dfba2a061 100644
--- a/dom/security/test/csp/file_base_uri_server.sjs
+++ b/system/security/content/test/csp/file_base_uri_server.sjs
diff --git a/dom/security/test/csp/file_blob_data_schemes.html b/system/security/content/test/csp/file_blob_data_schemes.html
index 0a4a49160..0a4a49160 100644
--- a/dom/security/test/csp/file_blob_data_schemes.html
+++ b/system/security/content/test/csp/file_blob_data_schemes.html
diff --git a/dom/security/test/csp/file_block_all_mcb.sjs b/system/security/content/test/csp/file_block_all_mcb.sjs
index 731553dd7..731553dd7 100644
--- a/dom/security/test/csp/file_block_all_mcb.sjs
+++ b/system/security/content/test/csp/file_block_all_mcb.sjs
diff --git a/dom/security/test/csp/file_block_all_mixed_content_frame_navigation1.html b/system/security/content/test/csp/file_block_all_mixed_content_frame_navigation1.html
index fdc1ae87a..fdc1ae87a 100644
--- a/dom/security/test/csp/file_block_all_mixed_content_frame_navigation1.html
+++ b/system/security/content/test/csp/file_block_all_mixed_content_frame_navigation1.html
diff --git a/dom/security/test/csp/file_block_all_mixed_content_frame_navigation2.html b/system/security/content/test/csp/file_block_all_mixed_content_frame_navigation2.html
index 4c4084e9e..4c4084e9e 100644
--- a/dom/security/test/csp/file_block_all_mixed_content_frame_navigation2.html
+++ b/system/security/content/test/csp/file_block_all_mixed_content_frame_navigation2.html
diff --git a/dom/security/test/csp/file_bug1229639.html b/system/security/content/test/csp/file_bug1229639.html
index 1e6152ead..1e6152ead 100644
--- a/dom/security/test/csp/file_bug1229639.html
+++ b/system/security/content/test/csp/file_bug1229639.html
diff --git a/dom/security/test/csp/file_bug1229639.html^headers^ b/system/security/content/test/csp/file_bug1229639.html^headers^
index 0177de7a3..0177de7a3 100644
--- a/dom/security/test/csp/file_bug1229639.html^headers^
+++ b/system/security/content/test/csp/file_bug1229639.html^headers^
diff --git a/dom/security/test/csp/file_bug1312272.html^headers^ b/system/security/content/test/csp/file_bug1312272.html^headers^
index 25a9483ea..25a9483ea 100644
--- a/dom/security/test/csp/file_bug1312272.html^headers^
+++ b/system/security/content/test/csp/file_bug1312272.html^headers^
diff --git a/dom/security/test/csp/file_bug1312272.js b/system/security/content/test/csp/file_bug1312272.js
index 01c03e43f..01c03e43f 100644
--- a/dom/security/test/csp/file_bug1312272.js
+++ b/system/security/content/test/csp/file_bug1312272.js
diff --git a/dom/security/test/csp/file_bug663567.xsl b/system/security/content/test/csp/file_bug663567.xsl
index b12b0d3b1..b12b0d3b1 100644
--- a/dom/security/test/csp/file_bug663567.xsl
+++ b/system/security/content/test/csp/file_bug663567.xsl
diff --git a/dom/security/test/csp/file_bug663567_allows.xml b/system/security/content/test/csp/file_bug663567_allows.xml
index 93d345103..93d345103 100644
--- a/dom/security/test/csp/file_bug663567_allows.xml
+++ b/system/security/content/test/csp/file_bug663567_allows.xml
diff --git a/dom/security/test/csp/file_bug663567_allows.xml^headers^ b/system/security/content/test/csp/file_bug663567_allows.xml^headers^
index 4c6fa3c26..4c6fa3c26 100644
--- a/dom/security/test/csp/file_bug663567_allows.xml^headers^
+++ b/system/security/content/test/csp/file_bug663567_allows.xml^headers^
diff --git a/dom/security/test/csp/file_bug663567_blocks.xml b/system/security/content/test/csp/file_bug663567_blocks.xml
index 93d345103..93d345103 100644
--- a/dom/security/test/csp/file_bug663567_blocks.xml
+++ b/system/security/content/test/csp/file_bug663567_blocks.xml
diff --git a/dom/security/test/csp/file_bug663567_blocks.xml^headers^ b/system/security/content/test/csp/file_bug663567_blocks.xml^headers^
index baf7f3c6a..baf7f3c6a 100644
--- a/dom/security/test/csp/file_bug663567_blocks.xml^headers^
+++ b/system/security/content/test/csp/file_bug663567_blocks.xml^headers^
diff --git a/dom/security/test/csp/file_bug802872.html b/system/security/content/test/csp/file_bug802872.html
index dc7129b0c..dc7129b0c 100644
--- a/dom/security/test/csp/file_bug802872.html
+++ b/system/security/content/test/csp/file_bug802872.html
diff --git a/dom/security/test/csp/file_bug802872.html^headers^ b/system/security/content/test/csp/file_bug802872.html^headers^
index 4c6fa3c26..4c6fa3c26 100644
--- a/dom/security/test/csp/file_bug802872.html^headers^
+++ b/system/security/content/test/csp/file_bug802872.html^headers^
diff --git a/dom/security/test/csp/file_bug802872.js b/system/security/content/test/csp/file_bug802872.js
index 5df8086cc..5df8086cc 100644
--- a/dom/security/test/csp/file_bug802872.js
+++ b/system/security/content/test/csp/file_bug802872.js
diff --git a/dom/security/test/csp/file_bug802872.sjs b/system/security/content/test/csp/file_bug802872.sjs
index b3e3f7024..b3e3f7024 100644
--- a/dom/security/test/csp/file_bug802872.sjs
+++ b/system/security/content/test/csp/file_bug802872.sjs
diff --git a/dom/security/test/csp/file_bug836922_npolicies.html b/system/security/content/test/csp/file_bug836922_npolicies.html
index 6a728813a..6a728813a 100644
--- a/dom/security/test/csp/file_bug836922_npolicies.html
+++ b/system/security/content/test/csp/file_bug836922_npolicies.html
diff --git a/dom/security/test/csp/file_bug836922_npolicies.html^headers^ b/system/security/content/test/csp/file_bug836922_npolicies.html^headers^
index ec6ba8c4a..ec6ba8c4a 100644
--- a/dom/security/test/csp/file_bug836922_npolicies.html^headers^
+++ b/system/security/content/test/csp/file_bug836922_npolicies.html^headers^
diff --git a/dom/security/test/csp/file_bug836922_npolicies_ro_violation.sjs b/system/security/content/test/csp/file_bug836922_npolicies_ro_violation.sjs
index 3e7603421..3e7603421 100644
--- a/dom/security/test/csp/file_bug836922_npolicies_ro_violation.sjs
+++ b/system/security/content/test/csp/file_bug836922_npolicies_ro_violation.sjs
diff --git a/dom/security/test/csp/file_bug836922_npolicies_violation.sjs b/system/security/content/test/csp/file_bug836922_npolicies_violation.sjs
index 15e4958af..15e4958af 100644
--- a/dom/security/test/csp/file_bug836922_npolicies_violation.sjs
+++ b/system/security/content/test/csp/file_bug836922_npolicies_violation.sjs
diff --git a/dom/security/test/csp/file_bug885433_allows.html b/system/security/content/test/csp/file_bug885433_allows.html
index 5d7aacbda..5d7aacbda 100644
--- a/dom/security/test/csp/file_bug885433_allows.html
+++ b/system/security/content/test/csp/file_bug885433_allows.html
diff --git a/dom/security/test/csp/file_bug885433_allows.html^headers^ b/system/security/content/test/csp/file_bug885433_allows.html^headers^
index 767b9ca92..767b9ca92 100644
--- a/dom/security/test/csp/file_bug885433_allows.html^headers^
+++ b/system/security/content/test/csp/file_bug885433_allows.html^headers^
diff --git a/dom/security/test/csp/file_bug885433_blocks.html b/system/security/content/test/csp/file_bug885433_blocks.html
index 2279b33e4..2279b33e4 100644
--- a/dom/security/test/csp/file_bug885433_blocks.html
+++ b/system/security/content/test/csp/file_bug885433_blocks.html
diff --git a/dom/security/test/csp/file_bug885433_blocks.html^headers^ b/system/security/content/test/csp/file_bug885433_blocks.html^headers^
index f82598b67..f82598b67 100644
--- a/dom/security/test/csp/file_bug885433_blocks.html^headers^
+++ b/system/security/content/test/csp/file_bug885433_blocks.html^headers^
diff --git a/dom/security/test/csp/file_bug886164.html b/system/security/content/test/csp/file_bug886164.html
index ec8c9e7e9..ec8c9e7e9 100644
--- a/dom/security/test/csp/file_bug886164.html
+++ b/system/security/content/test/csp/file_bug886164.html
diff --git a/dom/security/test/csp/file_bug886164.html^headers^ b/system/security/content/test/csp/file_bug886164.html^headers^
index 4c6fa3c26..4c6fa3c26 100644
--- a/dom/security/test/csp/file_bug886164.html^headers^
+++ b/system/security/content/test/csp/file_bug886164.html^headers^
diff --git a/dom/security/test/csp/file_bug886164_2.html b/system/security/content/test/csp/file_bug886164_2.html
index 83d36c55a..83d36c55a 100644
--- a/dom/security/test/csp/file_bug886164_2.html
+++ b/system/security/content/test/csp/file_bug886164_2.html
diff --git a/dom/security/test/csp/file_bug886164_2.html^headers^ b/system/security/content/test/csp/file_bug886164_2.html^headers^
index 4c6fa3c26..4c6fa3c26 100644
--- a/dom/security/test/csp/file_bug886164_2.html^headers^
+++ b/system/security/content/test/csp/file_bug886164_2.html^headers^
diff --git a/dom/security/test/csp/file_bug886164_3.html b/system/security/content/test/csp/file_bug886164_3.html
index 8b4313000..8b4313000 100644
--- a/dom/security/test/csp/file_bug886164_3.html
+++ b/system/security/content/test/csp/file_bug886164_3.html
diff --git a/dom/security/test/csp/file_bug886164_3.html^headers^ b/system/security/content/test/csp/file_bug886164_3.html^headers^
index 6581fd425..6581fd425 100644
--- a/dom/security/test/csp/file_bug886164_3.html^headers^
+++ b/system/security/content/test/csp/file_bug886164_3.html^headers^
diff --git a/dom/security/test/csp/file_bug886164_4.html b/system/security/content/test/csp/file_bug886164_4.html
index 41137ea01..41137ea01 100644
--- a/dom/security/test/csp/file_bug886164_4.html
+++ b/system/security/content/test/csp/file_bug886164_4.html
diff --git a/dom/security/test/csp/file_bug886164_4.html^headers^ b/system/security/content/test/csp/file_bug886164_4.html^headers^
index 6581fd425..6581fd425 100644
--- a/dom/security/test/csp/file_bug886164_4.html^headers^
+++ b/system/security/content/test/csp/file_bug886164_4.html^headers^
diff --git a/dom/security/test/csp/file_bug886164_5.html b/system/security/content/test/csp/file_bug886164_5.html
index ae65171a5..ae65171a5 100644
--- a/dom/security/test/csp/file_bug886164_5.html
+++ b/system/security/content/test/csp/file_bug886164_5.html
diff --git a/dom/security/test/csp/file_bug886164_5.html^headers^ b/system/security/content/test/csp/file_bug886164_5.html^headers^
index 3abc19055..3abc19055 100644
--- a/dom/security/test/csp/file_bug886164_5.html^headers^
+++ b/system/security/content/test/csp/file_bug886164_5.html^headers^
diff --git a/dom/security/test/csp/file_bug886164_6.html b/system/security/content/test/csp/file_bug886164_6.html
index f985ec8ce..f985ec8ce 100644
--- a/dom/security/test/csp/file_bug886164_6.html
+++ b/system/security/content/test/csp/file_bug886164_6.html
diff --git a/dom/security/test/csp/file_bug886164_6.html^headers^ b/system/security/content/test/csp/file_bug886164_6.html^headers^
index 6f9fc3f25..6f9fc3f25 100644
--- a/dom/security/test/csp/file_bug886164_6.html^headers^
+++ b/system/security/content/test/csp/file_bug886164_6.html^headers^
diff --git a/dom/security/test/csp/file_bug888172.html b/system/security/content/test/csp/file_bug888172.html
index 27cf9b00a..27cf9b00a 100644
--- a/dom/security/test/csp/file_bug888172.html
+++ b/system/security/content/test/csp/file_bug888172.html
diff --git a/dom/security/test/csp/file_bug888172.sjs b/system/security/content/test/csp/file_bug888172.sjs
index 03309610f..03309610f 100644
--- a/dom/security/test/csp/file_bug888172.sjs
+++ b/system/security/content/test/csp/file_bug888172.sjs
diff --git a/dom/security/test/csp/file_bug909029_none.html b/system/security/content/test/csp/file_bug909029_none.html
index 0d4934a4a..0d4934a4a 100644
--- a/dom/security/test/csp/file_bug909029_none.html
+++ b/system/security/content/test/csp/file_bug909029_none.html
diff --git a/dom/security/test/csp/file_bug909029_none.html^headers^ b/system/security/content/test/csp/file_bug909029_none.html^headers^
index ecb345875..ecb345875 100644
--- a/dom/security/test/csp/file_bug909029_none.html^headers^
+++ b/system/security/content/test/csp/file_bug909029_none.html^headers^
diff --git a/dom/security/test/csp/file_bug909029_star.html b/system/security/content/test/csp/file_bug909029_star.html
index bcb907a96..bcb907a96 100644
--- a/dom/security/test/csp/file_bug909029_star.html
+++ b/system/security/content/test/csp/file_bug909029_star.html
diff --git a/dom/security/test/csp/file_bug909029_star.html^headers^ b/system/security/content/test/csp/file_bug909029_star.html^headers^
index eccc1c011..eccc1c011 100644
--- a/dom/security/test/csp/file_bug909029_star.html^headers^
+++ b/system/security/content/test/csp/file_bug909029_star.html^headers^
diff --git a/dom/security/test/csp/file_bug910139.sjs b/system/security/content/test/csp/file_bug910139.sjs
index 172cc09c9..172cc09c9 100644
--- a/dom/security/test/csp/file_bug910139.sjs
+++ b/system/security/content/test/csp/file_bug910139.sjs
diff --git a/dom/security/test/csp/file_bug910139.xml b/system/security/content/test/csp/file_bug910139.xml
index 29feba941..29feba941 100644
--- a/dom/security/test/csp/file_bug910139.xml
+++ b/system/security/content/test/csp/file_bug910139.xml
diff --git a/dom/security/test/csp/file_bug910139.xsl b/system/security/content/test/csp/file_bug910139.xsl
index b99abca09..b99abca09 100644
--- a/dom/security/test/csp/file_bug910139.xsl
+++ b/system/security/content/test/csp/file_bug910139.xsl
diff --git a/dom/security/test/csp/file_bug941404.html b/system/security/content/test/csp/file_bug941404.html
index 3a2e636e0..3a2e636e0 100644
--- a/dom/security/test/csp/file_bug941404.html
+++ b/system/security/content/test/csp/file_bug941404.html
diff --git a/dom/security/test/csp/file_bug941404_xhr.html b/system/security/content/test/csp/file_bug941404_xhr.html
index 22e176f20..22e176f20 100644
--- a/dom/security/test/csp/file_bug941404_xhr.html
+++ b/system/security/content/test/csp/file_bug941404_xhr.html
diff --git a/dom/security/test/csp/file_bug941404_xhr.html^headers^ b/system/security/content/test/csp/file_bug941404_xhr.html^headers^
index 1e5f70cc3..1e5f70cc3 100644
--- a/dom/security/test/csp/file_bug941404_xhr.html^headers^
+++ b/system/security/content/test/csp/file_bug941404_xhr.html^headers^
diff --git a/dom/security/test/csp/file_child-src_iframe.html b/system/security/content/test/csp/file_child-src_iframe.html
index 3534aa329..3534aa329 100644
--- a/dom/security/test/csp/file_child-src_iframe.html
+++ b/system/security/content/test/csp/file_child-src_iframe.html
diff --git a/dom/security/test/csp/file_child-src_inner_frame.html b/system/security/content/test/csp/file_child-src_inner_frame.html
index e42102430..e42102430 100644
--- a/dom/security/test/csp/file_child-src_inner_frame.html
+++ b/system/security/content/test/csp/file_child-src_inner_frame.html
diff --git a/dom/security/test/csp/file_child-src_service_worker.html b/system/security/content/test/csp/file_child-src_service_worker.html
index b291a4a4e..b291a4a4e 100644
--- a/dom/security/test/csp/file_child-src_service_worker.html
+++ b/system/security/content/test/csp/file_child-src_service_worker.html
diff --git a/dom/security/test/csp/file_child-src_service_worker.js b/system/security/content/test/csp/file_child-src_service_worker.js
index 53f768707..53f768707 100644
--- a/dom/security/test/csp/file_child-src_service_worker.js
+++ b/system/security/content/test/csp/file_child-src_service_worker.js
diff --git a/dom/security/test/csp/file_child-src_shared_worker-redirect.html b/system/security/content/test/csp/file_child-src_shared_worker-redirect.html
index 313915302..313915302 100644
--- a/dom/security/test/csp/file_child-src_shared_worker-redirect.html
+++ b/system/security/content/test/csp/file_child-src_shared_worker-redirect.html
diff --git a/dom/security/test/csp/file_child-src_shared_worker.html b/system/security/content/test/csp/file_child-src_shared_worker.html
index 0e9a56a29..0e9a56a29 100644
--- a/dom/security/test/csp/file_child-src_shared_worker.html
+++ b/system/security/content/test/csp/file_child-src_shared_worker.html
diff --git a/dom/security/test/csp/file_child-src_shared_worker.js b/system/security/content/test/csp/file_child-src_shared_worker.js
index 0fca1394c..0fca1394c 100644
--- a/dom/security/test/csp/file_child-src_shared_worker.js
+++ b/system/security/content/test/csp/file_child-src_shared_worker.js
diff --git a/dom/security/test/csp/file_child-src_shared_worker_data.html b/system/security/content/test/csp/file_child-src_shared_worker_data.html
index a4befe4ca..a4befe4ca 100644
--- a/dom/security/test/csp/file_child-src_shared_worker_data.html
+++ b/system/security/content/test/csp/file_child-src_shared_worker_data.html
diff --git a/dom/security/test/csp/file_child-src_worker-redirect.html b/system/security/content/test/csp/file_child-src_worker-redirect.html
index b0029935c..b0029935c 100644
--- a/dom/security/test/csp/file_child-src_worker-redirect.html
+++ b/system/security/content/test/csp/file_child-src_worker-redirect.html
diff --git a/dom/security/test/csp/file_child-src_worker.html b/system/security/content/test/csp/file_child-src_worker.html
index 9300d3f61..9300d3f61 100644
--- a/dom/security/test/csp/file_child-src_worker.html
+++ b/system/security/content/test/csp/file_child-src_worker.html
diff --git a/dom/security/test/csp/file_child-src_worker.js b/system/security/content/test/csp/file_child-src_worker.js
index 1d93cac6b..1d93cac6b 100644
--- a/dom/security/test/csp/file_child-src_worker.js
+++ b/system/security/content/test/csp/file_child-src_worker.js
diff --git a/dom/security/test/csp/file_child-src_worker_data.html b/system/security/content/test/csp/file_child-src_worker_data.html
index e9e22f01d..e9e22f01d 100644
--- a/dom/security/test/csp/file_child-src_worker_data.html
+++ b/system/security/content/test/csp/file_child-src_worker_data.html
diff --git a/dom/security/test/csp/file_child_worker.js b/system/security/content/test/csp/file_child_worker.js
index 256234377..256234377 100644
--- a/dom/security/test/csp/file_child_worker.js
+++ b/system/security/content/test/csp/file_child_worker.js
diff --git a/dom/security/test/csp/file_child_worker.js^headers^ b/system/security/content/test/csp/file_child_worker.js^headers^
index 6581fd425..6581fd425 100644
--- a/dom/security/test/csp/file_child_worker.js^headers^
+++ b/system/security/content/test/csp/file_child_worker.js^headers^
diff --git a/dom/security/test/csp/file_connect-src-fetch.html b/system/security/content/test/csp/file_connect-src-fetch.html
index ff9b2f740..ff9b2f740 100644
--- a/dom/security/test/csp/file_connect-src-fetch.html
+++ b/system/security/content/test/csp/file_connect-src-fetch.html
diff --git a/dom/security/test/csp/file_connect-src.html b/system/security/content/test/csp/file_connect-src.html
index 17a940a0e..17a940a0e 100644
--- a/dom/security/test/csp/file_connect-src.html
+++ b/system/security/content/test/csp/file_connect-src.html
diff --git a/dom/security/test/csp/file_data-uri_blocked.html b/system/security/content/test/csp/file_data-uri_blocked.html
index 293e857e3..293e857e3 100644
--- a/dom/security/test/csp/file_data-uri_blocked.html
+++ b/system/security/content/test/csp/file_data-uri_blocked.html
diff --git a/dom/security/test/csp/file_data-uri_blocked.html^headers^ b/system/security/content/test/csp/file_data-uri_blocked.html^headers^
index f593253f9..f593253f9 100644
--- a/dom/security/test/csp/file_data-uri_blocked.html^headers^
+++ b/system/security/content/test/csp/file_data-uri_blocked.html^headers^
diff --git a/dom/security/test/csp/file_doccomment_meta.html b/system/security/content/test/csp/file_doccomment_meta.html
index a0f36a4bf..a0f36a4bf 100644
--- a/dom/security/test/csp/file_doccomment_meta.html
+++ b/system/security/content/test/csp/file_doccomment_meta.html
diff --git a/dom/security/test/csp/file_docwrite_meta.css b/system/security/content/test/csp/file_docwrite_meta.css
index de725038b..de725038b 100644
--- a/dom/security/test/csp/file_docwrite_meta.css
+++ b/system/security/content/test/csp/file_docwrite_meta.css
diff --git a/dom/security/test/csp/file_docwrite_meta.html b/system/security/content/test/csp/file_docwrite_meta.html
index 292de3bec..292de3bec 100644
--- a/dom/security/test/csp/file_docwrite_meta.html
+++ b/system/security/content/test/csp/file_docwrite_meta.html
diff --git a/dom/security/test/csp/file_docwrite_meta.js b/system/security/content/test/csp/file_docwrite_meta.js
index 722adc235..722adc235 100644
--- a/dom/security/test/csp/file_docwrite_meta.js
+++ b/system/security/content/test/csp/file_docwrite_meta.js
diff --git a/dom/security/test/csp/file_dual_header_testserver.sjs b/system/security/content/test/csp/file_dual_header_testserver.sjs
index d5631e783..d5631e783 100644
--- a/dom/security/test/csp/file_dual_header_testserver.sjs
+++ b/system/security/content/test/csp/file_dual_header_testserver.sjs
diff --git a/dom/security/test/csp/file_evalscript_main.html b/system/security/content/test/csp/file_evalscript_main.html
index e83c1d9ed..e83c1d9ed 100644
--- a/dom/security/test/csp/file_evalscript_main.html
+++ b/system/security/content/test/csp/file_evalscript_main.html
diff --git a/dom/security/test/csp/file_evalscript_main.html^headers^ b/system/security/content/test/csp/file_evalscript_main.html^headers^
index b91ba384d..b91ba384d 100644
--- a/dom/security/test/csp/file_evalscript_main.html^headers^
+++ b/system/security/content/test/csp/file_evalscript_main.html^headers^
diff --git a/dom/security/test/csp/file_evalscript_main.js b/system/security/content/test/csp/file_evalscript_main.js
index 64ab05664..64ab05664 100644
--- a/dom/security/test/csp/file_evalscript_main.js
+++ b/system/security/content/test/csp/file_evalscript_main.js
diff --git a/dom/security/test/csp/file_evalscript_main_allowed.html b/system/security/content/test/csp/file_evalscript_main_allowed.html
index 274972d9b..274972d9b 100644
--- a/dom/security/test/csp/file_evalscript_main_allowed.html
+++ b/system/security/content/test/csp/file_evalscript_main_allowed.html
diff --git a/dom/security/test/csp/file_evalscript_main_allowed.html^headers^ b/system/security/content/test/csp/file_evalscript_main_allowed.html^headers^
index 0cb5288be..0cb5288be 100644
--- a/dom/security/test/csp/file_evalscript_main_allowed.html^headers^
+++ b/system/security/content/test/csp/file_evalscript_main_allowed.html^headers^
diff --git a/dom/security/test/csp/file_evalscript_main_allowed.js b/system/security/content/test/csp/file_evalscript_main_allowed.js
index 69e6f7a4f..69e6f7a4f 100644
--- a/dom/security/test/csp/file_evalscript_main_allowed.js
+++ b/system/security/content/test/csp/file_evalscript_main_allowed.js
diff --git a/dom/security/test/csp/file_fontloader.sjs b/system/security/content/test/csp/file_fontloader.sjs
index 06f6e752d..06f6e752d 100644
--- a/dom/security/test/csp/file_fontloader.sjs
+++ b/system/security/content/test/csp/file_fontloader.sjs
diff --git a/dom/security/test/csp/file_fontloader.woff b/system/security/content/test/csp/file_fontloader.woff
index fbf7390d5..fbf7390d5 100644
--- a/dom/security/test/csp/file_fontloader.woff
+++ b/system/security/content/test/csp/file_fontloader.woff
diff --git a/dom/security/test/csp/file_form-action.html b/system/security/content/test/csp/file_form-action.html
index cfff156ba..cfff156ba 100644
--- a/dom/security/test/csp/file_form-action.html
+++ b/system/security/content/test/csp/file_form-action.html
diff --git a/dom/security/test/csp/file_form_action_server.sjs b/system/security/content/test/csp/file_form_action_server.sjs
index f2771d898..f2771d898 100644
--- a/dom/security/test/csp/file_form_action_server.sjs
+++ b/system/security/content/test/csp/file_form_action_server.sjs
diff --git a/dom/security/test/csp/file_frame_ancestors_ro.html b/system/security/content/test/csp/file_frame_ancestors_ro.html
index ff5ae9cf9..ff5ae9cf9 100644
--- a/dom/security/test/csp/file_frame_ancestors_ro.html
+++ b/system/security/content/test/csp/file_frame_ancestors_ro.html
diff --git a/dom/security/test/csp/file_frame_ancestors_ro.html^headers^ b/system/security/content/test/csp/file_frame_ancestors_ro.html^headers^
index d018af3a9..d018af3a9 100644
--- a/dom/security/test/csp/file_frame_ancestors_ro.html^headers^
+++ b/system/security/content/test/csp/file_frame_ancestors_ro.html^headers^
diff --git a/dom/security/test/csp/file_frame_src.js b/system/security/content/test/csp/file_frame_src.js
index 8e81f0743..8e81f0743 100644
--- a/dom/security/test/csp/file_frame_src.js
+++ b/system/security/content/test/csp/file_frame_src.js
diff --git a/dom/security/test/csp/file_frame_src_child_governs.html b/system/security/content/test/csp/file_frame_src_child_governs.html
index a51cb75be..a51cb75be 100644
--- a/dom/security/test/csp/file_frame_src_child_governs.html
+++ b/system/security/content/test/csp/file_frame_src_child_governs.html
diff --git a/dom/security/test/csp/file_frame_src_frame_governs.html b/system/security/content/test/csp/file_frame_src_frame_governs.html
index 2c5d5857f..2c5d5857f 100644
--- a/dom/security/test/csp/file_frame_src_frame_governs.html
+++ b/system/security/content/test/csp/file_frame_src_frame_governs.html
diff --git a/dom/security/test/csp/file_frame_src_inner.html b/system/security/content/test/csp/file_frame_src_inner.html
index 4a2fc6095..4a2fc6095 100644
--- a/dom/security/test/csp/file_frame_src_inner.html
+++ b/system/security/content/test/csp/file_frame_src_inner.html
diff --git a/dom/security/test/csp/file_frameancestors.sjs b/system/security/content/test/csp/file_frameancestors.sjs
index d0a77893f..d0a77893f 100644
--- a/dom/security/test/csp/file_frameancestors.sjs
+++ b/system/security/content/test/csp/file_frameancestors.sjs
diff --git a/dom/security/test/csp/file_frameancestors_main.html b/system/security/content/test/csp/file_frameancestors_main.html
index 97f9cb9ac..97f9cb9ac 100644
--- a/dom/security/test/csp/file_frameancestors_main.html
+++ b/system/security/content/test/csp/file_frameancestors_main.html
diff --git a/dom/security/test/csp/file_frameancestors_main.js b/system/security/content/test/csp/file_frameancestors_main.js
index caffc7257..caffc7257 100644
--- a/dom/security/test/csp/file_frameancestors_main.js
+++ b/system/security/content/test/csp/file_frameancestors_main.js
diff --git a/dom/security/test/csp/file_hash_source.html b/system/security/content/test/csp/file_hash_source.html
index 47eba6cf3..47eba6cf3 100644
--- a/dom/security/test/csp/file_hash_source.html
+++ b/system/security/content/test/csp/file_hash_source.html
diff --git a/dom/security/test/csp/file_hash_source.html^headers^ b/system/security/content/test/csp/file_hash_source.html^headers^
index 785d63391..785d63391 100644
--- a/dom/security/test/csp/file_hash_source.html^headers^
+++ b/system/security/content/test/csp/file_hash_source.html^headers^
diff --git a/dom/security/test/csp/file_iframe_sandbox_document_write.html b/system/security/content/test/csp/file_iframe_sandbox_document_write.html
index cdfa87c8f..cdfa87c8f 100644
--- a/dom/security/test/csp/file_iframe_sandbox_document_write.html
+++ b/system/security/content/test/csp/file_iframe_sandbox_document_write.html
diff --git a/dom/security/test/csp/file_iframe_sandbox_srcdoc.html b/system/security/content/test/csp/file_iframe_sandbox_srcdoc.html
index bc700ed68..bc700ed68 100644
--- a/dom/security/test/csp/file_iframe_sandbox_srcdoc.html
+++ b/system/security/content/test/csp/file_iframe_sandbox_srcdoc.html
diff --git a/dom/security/test/csp/file_iframe_sandbox_srcdoc.html^headers^ b/system/security/content/test/csp/file_iframe_sandbox_srcdoc.html^headers^
index cf869e07d..cf869e07d 100644
--- a/dom/security/test/csp/file_iframe_sandbox_srcdoc.html^headers^
+++ b/system/security/content/test/csp/file_iframe_sandbox_srcdoc.html^headers^
diff --git a/dom/security/test/csp/file_iframe_srcdoc.sjs b/system/security/content/test/csp/file_iframe_srcdoc.sjs
index 6de8a029e..6de8a029e 100644
--- a/dom/security/test/csp/file_iframe_srcdoc.sjs
+++ b/system/security/content/test/csp/file_iframe_srcdoc.sjs
diff --git a/dom/security/test/csp/file_ignore_unsafe_inline.html b/system/security/content/test/csp/file_ignore_unsafe_inline.html
index b0d44b570..b0d44b570 100644
--- a/dom/security/test/csp/file_ignore_unsafe_inline.html
+++ b/system/security/content/test/csp/file_ignore_unsafe_inline.html
diff --git a/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs b/system/security/content/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs
index 0f0a8ad3e..0f0a8ad3e 100644
--- a/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs
+++ b/system/security/content/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs
diff --git a/dom/security/test/csp/file_ignore_xfo.html b/system/security/content/test/csp/file_ignore_xfo.html
index 6746a3adb..6746a3adb 100644
--- a/dom/security/test/csp/file_ignore_xfo.html
+++ b/system/security/content/test/csp/file_ignore_xfo.html
diff --git a/dom/security/test/csp/file_ignore_xfo.html^headers^ b/system/security/content/test/csp/file_ignore_xfo.html^headers^
index e93f9e3ec..e93f9e3ec 100644
--- a/dom/security/test/csp/file_ignore_xfo.html^headers^
+++ b/system/security/content/test/csp/file_ignore_xfo.html^headers^
diff --git a/dom/security/test/csp/file_image_nonce.html b/system/security/content/test/csp/file_image_nonce.html
index 5d57bb837..5d57bb837 100644
--- a/dom/security/test/csp/file_image_nonce.html
+++ b/system/security/content/test/csp/file_image_nonce.html
diff --git a/dom/security/test/csp/file_image_nonce.html^headers^ b/system/security/content/test/csp/file_image_nonce.html^headers^
index 0d63558c4..0d63558c4 100644
--- a/dom/security/test/csp/file_image_nonce.html^headers^
+++ b/system/security/content/test/csp/file_image_nonce.html^headers^
diff --git a/dom/security/test/csp/file_inlinescript.html b/system/security/content/test/csp/file_inlinescript.html
index 55a9b9b18..55a9b9b18 100644
--- a/dom/security/test/csp/file_inlinescript.html
+++ b/system/security/content/test/csp/file_inlinescript.html
diff --git a/dom/security/test/csp/file_inlinestyle_main.html b/system/security/content/test/csp/file_inlinestyle_main.html
index a0d296988..a0d296988 100644
--- a/dom/security/test/csp/file_inlinestyle_main.html
+++ b/system/security/content/test/csp/file_inlinestyle_main.html
diff --git a/dom/security/test/csp/file_inlinestyle_main.html^headers^ b/system/security/content/test/csp/file_inlinestyle_main.html^headers^
index 7b6a25167..7b6a25167 100644
--- a/dom/security/test/csp/file_inlinestyle_main.html^headers^
+++ b/system/security/content/test/csp/file_inlinestyle_main.html^headers^
diff --git a/dom/security/test/csp/file_inlinestyle_main_allowed.html b/system/security/content/test/csp/file_inlinestyle_main_allowed.html
index 9b533ef07..9b533ef07 100644
--- a/dom/security/test/csp/file_inlinestyle_main_allowed.html
+++ b/system/security/content/test/csp/file_inlinestyle_main_allowed.html
diff --git a/dom/security/test/csp/file_inlinestyle_main_allowed.html^headers^ b/system/security/content/test/csp/file_inlinestyle_main_allowed.html^headers^
index 621d2536b..621d2536b 100644
--- a/dom/security/test/csp/file_inlinestyle_main_allowed.html^headers^
+++ b/system/security/content/test/csp/file_inlinestyle_main_allowed.html^headers^
diff --git a/dom/security/test/csp/file_invalid_source_expression.html b/system/security/content/test/csp/file_invalid_source_expression.html
index 83bb0ec0c..83bb0ec0c 100644
--- a/dom/security/test/csp/file_invalid_source_expression.html
+++ b/system/security/content/test/csp/file_invalid_source_expression.html
diff --git a/dom/security/test/csp/file_leading_wildcard.html b/system/security/content/test/csp/file_leading_wildcard.html
index ea5e99344..ea5e99344 100644
--- a/dom/security/test/csp/file_leading_wildcard.html
+++ b/system/security/content/test/csp/file_leading_wildcard.html
diff --git a/dom/security/test/csp/file_main.html b/system/security/content/test/csp/file_main.html
index ddc838261..ddc838261 100644
--- a/dom/security/test/csp/file_main.html
+++ b/system/security/content/test/csp/file_main.html
diff --git a/dom/security/test/csp/file_main.html^headers^ b/system/security/content/test/csp/file_main.html^headers^
index 3338de389..3338de389 100644
--- a/dom/security/test/csp/file_main.html^headers^
+++ b/system/security/content/test/csp/file_main.html^headers^
diff --git a/dom/security/test/csp/file_main.js b/system/security/content/test/csp/file_main.js
index d5afe580f..d5afe580f 100644
--- a/dom/security/test/csp/file_main.js
+++ b/system/security/content/test/csp/file_main.js
diff --git a/dom/security/test/csp/file_main_worker.js b/system/security/content/test/csp/file_main_worker.js
index d1314c843..d1314c843 100644
--- a/dom/security/test/csp/file_main_worker.js
+++ b/system/security/content/test/csp/file_main_worker.js
diff --git a/dom/security/test/csp/file_main_worker.js^headers^ b/system/security/content/test/csp/file_main_worker.js^headers^
index 3f5008ca6..3f5008ca6 100644
--- a/dom/security/test/csp/file_main_worker.js^headers^
+++ b/system/security/content/test/csp/file_main_worker.js^headers^
diff --git a/dom/security/test/csp/file_meta_element.html b/system/security/content/test/csp/file_meta_element.html
index 1d8ec6aa9..1d8ec6aa9 100644
--- a/dom/security/test/csp/file_meta_element.html
+++ b/system/security/content/test/csp/file_meta_element.html
diff --git a/dom/security/test/csp/file_meta_header_dual.sjs b/system/security/content/test/csp/file_meta_header_dual.sjs
index ddc38ffe5..ddc38ffe5 100644
--- a/dom/security/test/csp/file_meta_header_dual.sjs
+++ b/system/security/content/test/csp/file_meta_header_dual.sjs
diff --git a/dom/security/test/csp/file_meta_whitespace_skipping.html b/system/security/content/test/csp/file_meta_whitespace_skipping.html
index c0cfc8cc2..c0cfc8cc2 100644
--- a/dom/security/test/csp/file_meta_whitespace_skipping.html
+++ b/system/security/content/test/csp/file_meta_whitespace_skipping.html
diff --git a/dom/security/test/csp/file_multi_policy_injection_bypass.html b/system/security/content/test/csp/file_multi_policy_injection_bypass.html
index a3cb415a9..a3cb415a9 100644
--- a/dom/security/test/csp/file_multi_policy_injection_bypass.html
+++ b/system/security/content/test/csp/file_multi_policy_injection_bypass.html
diff --git a/dom/security/test/csp/file_multi_policy_injection_bypass.html^headers^ b/system/security/content/test/csp/file_multi_policy_injection_bypass.html^headers^
index e1b64a922..e1b64a922 100644
--- a/dom/security/test/csp/file_multi_policy_injection_bypass.html^headers^
+++ b/system/security/content/test/csp/file_multi_policy_injection_bypass.html^headers^
diff --git a/dom/security/test/csp/file_multi_policy_injection_bypass_2.html b/system/security/content/test/csp/file_multi_policy_injection_bypass_2.html
index 3fa6c7ab9..3fa6c7ab9 100644
--- a/dom/security/test/csp/file_multi_policy_injection_bypass_2.html
+++ b/system/security/content/test/csp/file_multi_policy_injection_bypass_2.html
diff --git a/dom/security/test/csp/file_multi_policy_injection_bypass_2.html^headers^ b/system/security/content/test/csp/file_multi_policy_injection_bypass_2.html^headers^
index b523073cd..b523073cd 100644
--- a/dom/security/test/csp/file_multi_policy_injection_bypass_2.html^headers^
+++ b/system/security/content/test/csp/file_multi_policy_injection_bypass_2.html^headers^
diff --git a/dom/security/test/csp/file_multipart_testserver.sjs b/system/security/content/test/csp/file_multipart_testserver.sjs
index d2eb58c82..d2eb58c82 100644
--- a/dom/security/test/csp/file_multipart_testserver.sjs
+++ b/system/security/content/test/csp/file_multipart_testserver.sjs
diff --git a/dom/security/test/csp/file_nonce_redirector.sjs b/system/security/content/test/csp/file_nonce_redirector.sjs
index 21a8f4e9c..21a8f4e9c 100644
--- a/dom/security/test/csp/file_nonce_redirector.sjs
+++ b/system/security/content/test/csp/file_nonce_redirector.sjs
diff --git a/dom/security/test/csp/file_nonce_redirects.html b/system/security/content/test/csp/file_nonce_redirects.html
index e29116490..e29116490 100644
--- a/dom/security/test/csp/file_nonce_redirects.html
+++ b/system/security/content/test/csp/file_nonce_redirects.html
diff --git a/dom/security/test/csp/file_nonce_source.html b/system/security/content/test/csp/file_nonce_source.html
index bf14ffe64..bf14ffe64 100644
--- a/dom/security/test/csp/file_nonce_source.html
+++ b/system/security/content/test/csp/file_nonce_source.html
diff --git a/dom/security/test/csp/file_nonce_source.html^headers^ b/system/security/content/test/csp/file_nonce_source.html^headers^
index 865e5fe98..865e5fe98 100644
--- a/dom/security/test/csp/file_nonce_source.html^headers^
+++ b/system/security/content/test/csp/file_nonce_source.html^headers^
diff --git a/dom/security/test/csp/file_null_baseuri.html b/system/security/content/test/csp/file_null_baseuri.html
index f995688b1..f995688b1 100644
--- a/dom/security/test/csp/file_null_baseuri.html
+++ b/system/security/content/test/csp/file_null_baseuri.html
diff --git a/dom/security/test/csp/file_path_matching.html b/system/security/content/test/csp/file_path_matching.html
index 662fbfb8a..662fbfb8a 100644
--- a/dom/security/test/csp/file_path_matching.html
+++ b/system/security/content/test/csp/file_path_matching.html
diff --git a/dom/security/test/csp/file_path_matching.js b/system/security/content/test/csp/file_path_matching.js
index 09286d42e..09286d42e 100644
--- a/dom/security/test/csp/file_path_matching.js
+++ b/system/security/content/test/csp/file_path_matching.js
diff --git a/dom/security/test/csp/file_path_matching_incl_query.html b/system/security/content/test/csp/file_path_matching_incl_query.html
index 50af2b143..50af2b143 100644
--- a/dom/security/test/csp/file_path_matching_incl_query.html
+++ b/system/security/content/test/csp/file_path_matching_incl_query.html
diff --git a/dom/security/test/csp/file_path_matching_redirect.html b/system/security/content/test/csp/file_path_matching_redirect.html
index a16cc90ec..a16cc90ec 100644
--- a/dom/security/test/csp/file_path_matching_redirect.html
+++ b/system/security/content/test/csp/file_path_matching_redirect.html
diff --git a/dom/security/test/csp/file_path_matching_redirect_server.sjs b/system/security/content/test/csp/file_path_matching_redirect_server.sjs
index 49a3160f4..49a3160f4 100644
--- a/dom/security/test/csp/file_path_matching_redirect_server.sjs
+++ b/system/security/content/test/csp/file_path_matching_redirect_server.sjs
diff --git a/dom/security/test/csp/file_ping.html b/system/security/content/test/csp/file_ping.html
index 8aaf34cc3..8aaf34cc3 100644
--- a/dom/security/test/csp/file_ping.html
+++ b/system/security/content/test/csp/file_ping.html
diff --git a/dom/security/test/csp/file_policyuri_regression_from_multipolicy.html b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy.html
index 2a75eef7e..2a75eef7e 100644
--- a/dom/security/test/csp/file_policyuri_regression_from_multipolicy.html
+++ b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy.html
diff --git a/dom/security/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
index c4ff8ea9f..c4ff8ea9f 100644
--- a/dom/security/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
+++ b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
diff --git a/dom/security/test/csp/file_policyuri_regression_from_multipolicy_policy b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy_policy
index a5c610cd7..a5c610cd7 100644
--- a/dom/security/test/csp/file_policyuri_regression_from_multipolicy_policy
+++ b/system/security/content/test/csp/file_policyuri_regression_from_multipolicy_policy
diff --git a/dom/security/test/csp/file_punycode_host_src.js b/system/security/content/test/csp/file_punycode_host_src.js
index 3505faf70..3505faf70 100644
--- a/dom/security/test/csp/file_punycode_host_src.js
+++ b/system/security/content/test/csp/file_punycode_host_src.js
diff --git a/dom/security/test/csp/file_punycode_host_src.sjs b/system/security/content/test/csp/file_punycode_host_src.sjs
index 3189cc063..3189cc063 100644
--- a/dom/security/test/csp/file_punycode_host_src.sjs
+++ b/system/security/content/test/csp/file_punycode_host_src.sjs
diff --git a/dom/security/test/csp/file_redirect_content.sjs b/system/security/content/test/csp/file_redirect_content.sjs
index 080f179cd..080f179cd 100644
--- a/dom/security/test/csp/file_redirect_content.sjs
+++ b/system/security/content/test/csp/file_redirect_content.sjs
diff --git a/dom/security/test/csp/file_redirect_report.sjs b/system/security/content/test/csp/file_redirect_report.sjs
index 9cc7e6548..9cc7e6548 100644
--- a/dom/security/test/csp/file_redirect_report.sjs
+++ b/system/security/content/test/csp/file_redirect_report.sjs
diff --git a/dom/security/test/csp/file_redirect_worker.sjs b/system/security/content/test/csp/file_redirect_worker.sjs
index 27df6a5fd..27df6a5fd 100644
--- a/dom/security/test/csp/file_redirect_worker.sjs
+++ b/system/security/content/test/csp/file_redirect_worker.sjs
diff --git a/dom/security/test/csp/file_redirects_main.html b/system/security/content/test/csp/file_redirects_main.html
index d05af88fe..d05af88fe 100644
--- a/dom/security/test/csp/file_redirects_main.html
+++ b/system/security/content/test/csp/file_redirects_main.html
diff --git a/dom/security/test/csp/file_redirects_page.sjs b/system/security/content/test/csp/file_redirects_page.sjs
index ced2d0787..ced2d0787 100644
--- a/dom/security/test/csp/file_redirects_page.sjs
+++ b/system/security/content/test/csp/file_redirects_page.sjs
diff --git a/dom/security/test/csp/file_redirects_resource.sjs b/system/security/content/test/csp/file_redirects_resource.sjs
index da138630f..da138630f 100644
--- a/dom/security/test/csp/file_redirects_resource.sjs
+++ b/system/security/content/test/csp/file_redirects_resource.sjs
diff --git a/dom/security/test/csp/file_referrerdirective.html b/system/security/content/test/csp/file_referrerdirective.html
index 841ffe058..841ffe058 100644
--- a/dom/security/test/csp/file_referrerdirective.html
+++ b/system/security/content/test/csp/file_referrerdirective.html
diff --git a/dom/security/test/csp/file_report.html b/system/security/content/test/csp/file_report.html
index fb18af805..fb18af805 100644
--- a/dom/security/test/csp/file_report.html
+++ b/system/security/content/test/csp/file_report.html
diff --git a/dom/security/test/csp/file_report_chromescript.js b/system/security/content/test/csp/file_report_chromescript.js
index bf4f70edb..bf4f70edb 100644
--- a/dom/security/test/csp/file_report_chromescript.js
+++ b/system/security/content/test/csp/file_report_chromescript.js
diff --git a/dom/security/test/csp/file_report_for_import.css b/system/security/content/test/csp/file_report_for_import.css
index b578b77b3..b578b77b3 100644
--- a/dom/security/test/csp/file_report_for_import.css
+++ b/system/security/content/test/csp/file_report_for_import.css
diff --git a/dom/security/test/csp/file_report_for_import.html b/system/security/content/test/csp/file_report_for_import.html
index 77a36faea..77a36faea 100644
--- a/dom/security/test/csp/file_report_for_import.html
+++ b/system/security/content/test/csp/file_report_for_import.html
diff --git a/dom/security/test/csp/file_report_for_import_server.sjs b/system/security/content/test/csp/file_report_for_import_server.sjs
index e69852b1b..e69852b1b 100644
--- a/dom/security/test/csp/file_report_for_import_server.sjs
+++ b/system/security/content/test/csp/file_report_for_import_server.sjs
diff --git a/dom/security/test/csp/file_report_uri_missing_in_report_only_header.html b/system/security/content/test/csp/file_report_uri_missing_in_report_only_header.html
index e69de29bb..e69de29bb 100644
--- a/dom/security/test/csp/file_report_uri_missing_in_report_only_header.html
+++ b/system/security/content/test/csp/file_report_uri_missing_in_report_only_header.html
diff --git a/dom/security/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ b/system/security/content/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
index 3f2fdfe9e..3f2fdfe9e 100644
--- a/dom/security/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
+++ b/system/security/content/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
diff --git a/dom/security/test/csp/file_require_sri_meta.js b/system/security/content/test/csp/file_require_sri_meta.js
index af0113297..af0113297 100644
--- a/dom/security/test/csp/file_require_sri_meta.js
+++ b/system/security/content/test/csp/file_require_sri_meta.js
diff --git a/dom/security/test/csp/file_require_sri_meta.sjs b/system/security/content/test/csp/file_require_sri_meta.sjs
index acaf742db..acaf742db 100644
--- a/dom/security/test/csp/file_require_sri_meta.sjs
+++ b/system/security/content/test/csp/file_require_sri_meta.sjs
diff --git a/dom/security/test/csp/file_ro_ignore_xfo.html b/system/security/content/test/csp/file_ro_ignore_xfo.html
index 85e7f0092..85e7f0092 100644
--- a/dom/security/test/csp/file_ro_ignore_xfo.html
+++ b/system/security/content/test/csp/file_ro_ignore_xfo.html
diff --git a/dom/security/test/csp/file_ro_ignore_xfo.html^headers^ b/system/security/content/test/csp/file_ro_ignore_xfo.html^headers^
index ab8366f06..ab8366f06 100644
--- a/dom/security/test/csp/file_ro_ignore_xfo.html^headers^
+++ b/system/security/content/test/csp/file_ro_ignore_xfo.html^headers^
diff --git a/dom/security/test/csp/file_sandbox_1.html b/system/security/content/test/csp/file_sandbox_1.html
index ce1e80c86..ce1e80c86 100644
--- a/dom/security/test/csp/file_sandbox_1.html
+++ b/system/security/content/test/csp/file_sandbox_1.html
diff --git a/dom/security/test/csp/file_sandbox_10.html b/system/security/content/test/csp/file_sandbox_10.html
index f934497ee..f934497ee 100644
--- a/dom/security/test/csp/file_sandbox_10.html
+++ b/system/security/content/test/csp/file_sandbox_10.html
diff --git a/dom/security/test/csp/file_sandbox_11.html b/system/security/content/test/csp/file_sandbox_11.html
index 03697438a..03697438a 100644
--- a/dom/security/test/csp/file_sandbox_11.html
+++ b/system/security/content/test/csp/file_sandbox_11.html
diff --git a/dom/security/test/csp/file_sandbox_12.html b/system/security/content/test/csp/file_sandbox_12.html
index 8bed9dc59..8bed9dc59 100644
--- a/dom/security/test/csp/file_sandbox_12.html
+++ b/system/security/content/test/csp/file_sandbox_12.html
diff --git a/dom/security/test/csp/file_sandbox_13.html b/system/security/content/test/csp/file_sandbox_13.html
index e4672ed05..e4672ed05 100644
--- a/dom/security/test/csp/file_sandbox_13.html
+++ b/system/security/content/test/csp/file_sandbox_13.html
diff --git a/dom/security/test/csp/file_sandbox_2.html b/system/security/content/test/csp/file_sandbox_2.html
index b37aa1bce..b37aa1bce 100644
--- a/dom/security/test/csp/file_sandbox_2.html
+++ b/system/security/content/test/csp/file_sandbox_2.html
diff --git a/dom/security/test/csp/file_sandbox_3.html b/system/security/content/test/csp/file_sandbox_3.html
index ba808e47d..ba808e47d 100644
--- a/dom/security/test/csp/file_sandbox_3.html
+++ b/system/security/content/test/csp/file_sandbox_3.html
diff --git a/dom/security/test/csp/file_sandbox_4.html b/system/security/content/test/csp/file_sandbox_4.html
index b2d4ed094..b2d4ed094 100644
--- a/dom/security/test/csp/file_sandbox_4.html
+++ b/system/security/content/test/csp/file_sandbox_4.html
diff --git a/dom/security/test/csp/file_sandbox_5.html b/system/security/content/test/csp/file_sandbox_5.html
index 79894eabb..79894eabb 100644
--- a/dom/security/test/csp/file_sandbox_5.html
+++ b/system/security/content/test/csp/file_sandbox_5.html
diff --git a/dom/security/test/csp/file_sandbox_6.html b/system/security/content/test/csp/file_sandbox_6.html
index c23d87860..c23d87860 100644
--- a/dom/security/test/csp/file_sandbox_6.html
+++ b/system/security/content/test/csp/file_sandbox_6.html
diff --git a/dom/security/test/csp/file_sandbox_7.html b/system/security/content/test/csp/file_sandbox_7.html
index 3b249d410..3b249d410 100644
--- a/dom/security/test/csp/file_sandbox_7.html
+++ b/system/security/content/test/csp/file_sandbox_7.html
diff --git a/dom/security/test/csp/file_sandbox_8.html b/system/security/content/test/csp/file_sandbox_8.html
index 4f9cd8916..4f9cd8916 100644
--- a/dom/security/test/csp/file_sandbox_8.html
+++ b/system/security/content/test/csp/file_sandbox_8.html
diff --git a/dom/security/test/csp/file_sandbox_9.html b/system/security/content/test/csp/file_sandbox_9.html
index 29ffc191c..29ffc191c 100644
--- a/dom/security/test/csp/file_sandbox_9.html
+++ b/system/security/content/test/csp/file_sandbox_9.html
diff --git a/dom/security/test/csp/file_sandbox_allow_scripts.html b/system/security/content/test/csp/file_sandbox_allow_scripts.html
index faab9f0fc..faab9f0fc 100644
--- a/dom/security/test/csp/file_sandbox_allow_scripts.html
+++ b/system/security/content/test/csp/file_sandbox_allow_scripts.html
diff --git a/dom/security/test/csp/file_sandbox_allow_scripts.html^headers^ b/system/security/content/test/csp/file_sandbox_allow_scripts.html^headers^
index 4705ce9de..4705ce9de 100644
--- a/dom/security/test/csp/file_sandbox_allow_scripts.html^headers^
+++ b/system/security/content/test/csp/file_sandbox_allow_scripts.html^headers^
diff --git a/dom/security/test/csp/file_sandbox_fail.js b/system/security/content/test/csp/file_sandbox_fail.js
index 5403ff218..5403ff218 100644
--- a/dom/security/test/csp/file_sandbox_fail.js
+++ b/system/security/content/test/csp/file_sandbox_fail.js
diff --git a/dom/security/test/csp/file_sandbox_pass.js b/system/security/content/test/csp/file_sandbox_pass.js
index 2fd0350dc..2fd0350dc 100644
--- a/dom/security/test/csp/file_sandbox_pass.js
+++ b/system/security/content/test/csp/file_sandbox_pass.js
diff --git a/dom/security/test/csp/file_scheme_relative_sources.js b/system/security/content/test/csp/file_scheme_relative_sources.js
index 09286d42e..09286d42e 100644
--- a/dom/security/test/csp/file_scheme_relative_sources.js
+++ b/system/security/content/test/csp/file_scheme_relative_sources.js
diff --git a/dom/security/test/csp/file_scheme_relative_sources.sjs b/system/security/content/test/csp/file_scheme_relative_sources.sjs
index 8c4d62ca5..8c4d62ca5 100644
--- a/dom/security/test/csp/file_scheme_relative_sources.sjs
+++ b/system/security/content/test/csp/file_scheme_relative_sources.sjs
diff --git a/dom/security/test/csp/file_self_none_as_hostname_confusion.html b/system/security/content/test/csp/file_self_none_as_hostname_confusion.html
index 16196bb19..16196bb19 100644
--- a/dom/security/test/csp/file_self_none_as_hostname_confusion.html
+++ b/system/security/content/test/csp/file_self_none_as_hostname_confusion.html
diff --git a/dom/security/test/csp/file_self_none_as_hostname_confusion.html^headers^ b/system/security/content/test/csp/file_self_none_as_hostname_confusion.html^headers^
index 26af7ed9b..26af7ed9b 100644
--- a/dom/security/test/csp/file_self_none_as_hostname_confusion.html^headers^
+++ b/system/security/content/test/csp/file_self_none_as_hostname_confusion.html^headers^
diff --git a/dom/security/test/csp/file_sendbeacon.html b/system/security/content/test/csp/file_sendbeacon.html
index 13202c65f..13202c65f 100644
--- a/dom/security/test/csp/file_sendbeacon.html
+++ b/system/security/content/test/csp/file_sendbeacon.html
diff --git a/dom/security/test/csp/file_service_worker.html b/system/security/content/test/csp/file_service_worker.html
index 00a2b4020..00a2b4020 100644
--- a/dom/security/test/csp/file_service_worker.html
+++ b/system/security/content/test/csp/file_service_worker.html
diff --git a/dom/security/test/csp/file_service_worker.js b/system/security/content/test/csp/file_service_worker.js
index 1bf583f4c..1bf583f4c 100644
--- a/dom/security/test/csp/file_service_worker.js
+++ b/system/security/content/test/csp/file_service_worker.js
diff --git a/dom/security/test/csp/file_shouldprocess.html b/system/security/content/test/csp/file_shouldprocess.html
index 0684507e9..0684507e9 100644
--- a/dom/security/test/csp/file_shouldprocess.html
+++ b/system/security/content/test/csp/file_shouldprocess.html
diff --git a/dom/security/test/csp/file_spawn_service_worker.js b/system/security/content/test/csp/file_spawn_service_worker.js
index b262fa10a..b262fa10a 100644
--- a/dom/security/test/csp/file_spawn_service_worker.js
+++ b/system/security/content/test/csp/file_spawn_service_worker.js
diff --git a/dom/security/test/csp/file_spawn_shared_worker.js b/system/security/content/test/csp/file_spawn_shared_worker.js
index 00063bc5c..00063bc5c 100644
--- a/dom/security/test/csp/file_spawn_shared_worker.js
+++ b/system/security/content/test/csp/file_spawn_shared_worker.js
diff --git a/dom/security/test/csp/file_spawn_worker.js b/system/security/content/test/csp/file_spawn_worker.js
index acde7408c..acde7408c 100644
--- a/dom/security/test/csp/file_spawn_worker.js
+++ b/system/security/content/test/csp/file_spawn_worker.js
diff --git a/dom/security/test/csp/file_strict_dynamic.js b/system/security/content/test/csp/file_strict_dynamic.js
index 09286d42e..09286d42e 100644
--- a/dom/security/test/csp/file_strict_dynamic.js
+++ b/system/security/content/test/csp/file_strict_dynamic.js
diff --git a/dom/security/test/csp/file_strict_dynamic_default_src.html b/system/security/content/test/csp/file_strict_dynamic_default_src.html
index 35feacb4f..35feacb4f 100644
--- a/dom/security/test/csp/file_strict_dynamic_default_src.html
+++ b/system/security/content/test/csp/file_strict_dynamic_default_src.html
diff --git a/dom/security/test/csp/file_strict_dynamic_default_src.js b/system/security/content/test/csp/file_strict_dynamic_default_src.js
index 09286d42e..09286d42e 100644
--- a/dom/security/test/csp/file_strict_dynamic_default_src.js
+++ b/system/security/content/test/csp/file_strict_dynamic_default_src.js
diff --git a/dom/security/test/csp/file_strict_dynamic_js_url.html b/system/security/content/test/csp/file_strict_dynamic_js_url.html
index bd53b0adb..bd53b0adb 100644
--- a/dom/security/test/csp/file_strict_dynamic_js_url.html
+++ b/system/security/content/test/csp/file_strict_dynamic_js_url.html
diff --git a/dom/security/test/csp/file_strict_dynamic_non_parser_inserted.html b/system/security/content/test/csp/file_strict_dynamic_non_parser_inserted.html
index c51fefd72..c51fefd72 100644
--- a/dom/security/test/csp/file_strict_dynamic_non_parser_inserted.html
+++ b/system/security/content/test/csp/file_strict_dynamic_non_parser_inserted.html
diff --git a/dom/security/test/csp/file_strict_dynamic_non_parser_inserted_inline.html b/system/security/content/test/csp/file_strict_dynamic_non_parser_inserted_inline.html
index 10a0f32e4..10a0f32e4 100644
--- a/dom/security/test/csp/file_strict_dynamic_non_parser_inserted_inline.html
+++ b/system/security/content/test/csp/file_strict_dynamic_non_parser_inserted_inline.html
diff --git a/dom/security/test/csp/file_strict_dynamic_parser_inserted_doc_write.html b/system/security/content/test/csp/file_strict_dynamic_parser_inserted_doc_write.html
index 2a3a7d499..2a3a7d499 100644
--- a/dom/security/test/csp/file_strict_dynamic_parser_inserted_doc_write.html
+++ b/system/security/content/test/csp/file_strict_dynamic_parser_inserted_doc_write.html
diff --git a/dom/security/test/csp/file_strict_dynamic_parser_inserted_doc_write_correct_nonce.html b/system/security/content/test/csp/file_strict_dynamic_parser_inserted_doc_write_correct_nonce.html
index 9938ef2dc..9938ef2dc 100644
--- a/dom/security/test/csp/file_strict_dynamic_parser_inserted_doc_write_correct_nonce.html
+++ b/system/security/content/test/csp/file_strict_dynamic_parser_inserted_doc_write_correct_nonce.html
diff --git a/dom/security/test/csp/file_strict_dynamic_script_events.html b/system/security/content/test/csp/file_strict_dynamic_script_events.html
index 088958382..088958382 100644
--- a/dom/security/test/csp/file_strict_dynamic_script_events.html
+++ b/system/security/content/test/csp/file_strict_dynamic_script_events.html
diff --git a/dom/security/test/csp/file_strict_dynamic_script_extern.html b/system/security/content/test/csp/file_strict_dynamic_script_extern.html
index 94b6aefb1..94b6aefb1 100644
--- a/dom/security/test/csp/file_strict_dynamic_script_extern.html
+++ b/system/security/content/test/csp/file_strict_dynamic_script_extern.html
diff --git a/dom/security/test/csp/file_strict_dynamic_script_inline.html b/system/security/content/test/csp/file_strict_dynamic_script_inline.html
index d17a58f27..d17a58f27 100644
--- a/dom/security/test/csp/file_strict_dynamic_script_inline.html
+++ b/system/security/content/test/csp/file_strict_dynamic_script_inline.html
diff --git a/dom/security/test/csp/file_strict_dynamic_unsafe_eval.html b/system/security/content/test/csp/file_strict_dynamic_unsafe_eval.html
index f0b26da91..f0b26da91 100644
--- a/dom/security/test/csp/file_strict_dynamic_unsafe_eval.html
+++ b/system/security/content/test/csp/file_strict_dynamic_unsafe_eval.html
diff --git a/dom/security/test/csp/file_subframe_run_js_if_allowed.html b/system/security/content/test/csp/file_subframe_run_js_if_allowed.html
index 3ba970ce8..3ba970ce8 100644
--- a/dom/security/test/csp/file_subframe_run_js_if_allowed.html
+++ b/system/security/content/test/csp/file_subframe_run_js_if_allowed.html
diff --git a/dom/security/test/csp/file_subframe_run_js_if_allowed.html^headers^ b/system/security/content/test/csp/file_subframe_run_js_if_allowed.html^headers^
index 233b35931..233b35931 100644
--- a/dom/security/test/csp/file_subframe_run_js_if_allowed.html^headers^
+++ b/system/security/content/test/csp/file_subframe_run_js_if_allowed.html^headers^
diff --git a/dom/security/test/csp/file_testserver.sjs b/system/security/content/test/csp/file_testserver.sjs
index ae1826611..ae1826611 100644
--- a/dom/security/test/csp/file_testserver.sjs
+++ b/system/security/content/test/csp/file_testserver.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure.html b/system/security/content/test/csp/file_upgrade_insecure.html
index d104a3a24..d104a3a24 100644
--- a/dom/security/test/csp/file_upgrade_insecure.html
+++ b/system/security/content/test/csp/file_upgrade_insecure.html
diff --git a/dom/security/test/csp/file_upgrade_insecure_cors.html b/system/security/content/test/csp/file_upgrade_insecure_cors.html
index e675c62e9..e675c62e9 100644
--- a/dom/security/test/csp/file_upgrade_insecure_cors.html
+++ b/system/security/content/test/csp/file_upgrade_insecure_cors.html
diff --git a/dom/security/test/csp/file_upgrade_insecure_cors_server.sjs b/system/security/content/test/csp/file_upgrade_insecure_cors_server.sjs
index 33f6c3b23..33f6c3b23 100644
--- a/dom/security/test/csp/file_upgrade_insecure_cors_server.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_cors_server.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_docwrite_iframe.sjs b/system/security/content/test/csp/file_upgrade_insecure_docwrite_iframe.sjs
index 6870a57bb..6870a57bb 100644
--- a/dom/security/test/csp/file_upgrade_insecure_docwrite_iframe.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_docwrite_iframe.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_meta.html b/system/security/content/test/csp/file_upgrade_insecure_meta.html
index 5f65e78ec..5f65e78ec 100644
--- a/dom/security/test/csp/file_upgrade_insecure_meta.html
+++ b/system/security/content/test/csp/file_upgrade_insecure_meta.html
diff --git a/dom/security/test/csp/file_upgrade_insecure_navigation.sjs b/system/security/content/test/csp/file_upgrade_insecure_navigation.sjs
index 51afa39bf..51afa39bf 100644
--- a/dom/security/test/csp/file_upgrade_insecure_navigation.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_navigation.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_referrer.sjs b/system/security/content/test/csp/file_upgrade_insecure_referrer.sjs
index e149afa4b..e149afa4b 100644
--- a/dom/security/test/csp/file_upgrade_insecure_referrer.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_referrer.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_referrer_server.sjs b/system/security/content/test/csp/file_upgrade_insecure_referrer_server.sjs
index be1e6da0c..be1e6da0c 100644
--- a/dom/security/test/csp/file_upgrade_insecure_referrer_server.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_referrer_server.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_reporting.html b/system/security/content/test/csp/file_upgrade_insecure_reporting.html
index c78e9a784..c78e9a784 100644
--- a/dom/security/test/csp/file_upgrade_insecure_reporting.html
+++ b/system/security/content/test/csp/file_upgrade_insecure_reporting.html
diff --git a/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs b/system/security/content/test/csp/file_upgrade_insecure_reporting_server.sjs
index b9940a7fd..b9940a7fd 100644
--- a/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_reporting_server.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_server.sjs b/system/security/content/test/csp/file_upgrade_insecure_server.sjs
index e27b97830..e27b97830 100644
--- a/dom/security/test/csp/file_upgrade_insecure_server.sjs
+++ b/system/security/content/test/csp/file_upgrade_insecure_server.sjs
diff --git a/dom/security/test/csp/file_upgrade_insecure_wsh.py b/system/security/content/test/csp/file_upgrade_insecure_wsh.py
index 0ae161bff..0ae161bff 100644
--- a/dom/security/test/csp/file_upgrade_insecure_wsh.py
+++ b/system/security/content/test/csp/file_upgrade_insecure_wsh.py
diff --git a/dom/security/test/csp/file_web_manifest.html b/system/security/content/test/csp/file_web_manifest.html
index 0f6a67460..0f6a67460 100644
--- a/dom/security/test/csp/file_web_manifest.html
+++ b/system/security/content/test/csp/file_web_manifest.html
diff --git a/dom/security/test/csp/file_web_manifest.json b/system/security/content/test/csp/file_web_manifest.json
index 917ab73ef..917ab73ef 100644
--- a/dom/security/test/csp/file_web_manifest.json
+++ b/system/security/content/test/csp/file_web_manifest.json
diff --git a/dom/security/test/csp/file_web_manifest.json^headers^ b/system/security/content/test/csp/file_web_manifest.json^headers^
index e0e00c4be..e0e00c4be 100644
--- a/dom/security/test/csp/file_web_manifest.json^headers^
+++ b/system/security/content/test/csp/file_web_manifest.json^headers^
diff --git a/dom/security/test/csp/file_web_manifest_https.html b/system/security/content/test/csp/file_web_manifest_https.html
index b0ff9ef85..b0ff9ef85 100644
--- a/dom/security/test/csp/file_web_manifest_https.html
+++ b/system/security/content/test/csp/file_web_manifest_https.html
diff --git a/dom/security/test/csp/file_web_manifest_https.json b/system/security/content/test/csp/file_web_manifest_https.json
index 917ab73ef..917ab73ef 100644
--- a/dom/security/test/csp/file_web_manifest_https.json
+++ b/system/security/content/test/csp/file_web_manifest_https.json
diff --git a/dom/security/test/csp/file_web_manifest_mixed_content.html b/system/security/content/test/csp/file_web_manifest_mixed_content.html
index 55f17c0f9..55f17c0f9 100644
--- a/dom/security/test/csp/file_web_manifest_mixed_content.html
+++ b/system/security/content/test/csp/file_web_manifest_mixed_content.html
diff --git a/dom/security/test/csp/file_web_manifest_remote.html b/system/security/content/test/csp/file_web_manifest_remote.html
index 7ecf8eec4..7ecf8eec4 100644
--- a/dom/security/test/csp/file_web_manifest_remote.html
+++ b/system/security/content/test/csp/file_web_manifest_remote.html
diff --git a/dom/security/test/csp/file_websocket_explicit.html b/system/security/content/test/csp/file_websocket_explicit.html
index 51462ab74..51462ab74 100644
--- a/dom/security/test/csp/file_websocket_explicit.html
+++ b/system/security/content/test/csp/file_websocket_explicit.html
diff --git a/dom/security/test/csp/file_websocket_self.html b/system/security/content/test/csp/file_websocket_self.html
index 3ff5f0558..3ff5f0558 100644
--- a/dom/security/test/csp/file_websocket_self.html
+++ b/system/security/content/test/csp/file_websocket_self.html
diff --git a/dom/security/test/csp/file_websocket_self_wsh.py b/system/security/content/test/csp/file_websocket_self_wsh.py
index 5fe508a91..5fe508a91 100644
--- a/dom/security/test/csp/file_websocket_self_wsh.py
+++ b/system/security/content/test/csp/file_websocket_self_wsh.py
diff --git a/dom/security/test/csp/file_worker_src.js b/system/security/content/test/csp/file_worker_src.js
index ad3ade6a6..ad3ade6a6 100644
--- a/dom/security/test/csp/file_worker_src.js
+++ b/system/security/content/test/csp/file_worker_src.js
diff --git a/dom/security/test/csp/file_worker_src_child_governs.html b/system/security/content/test/csp/file_worker_src_child_governs.html
index ca8a683aa..ca8a683aa 100644
--- a/dom/security/test/csp/file_worker_src_child_governs.html
+++ b/system/security/content/test/csp/file_worker_src_child_governs.html
diff --git a/dom/security/test/csp/file_worker_src_script_governs.html b/system/security/content/test/csp/file_worker_src_script_governs.html
index 0385fee57..0385fee57 100644
--- a/dom/security/test/csp/file_worker_src_script_governs.html
+++ b/system/security/content/test/csp/file_worker_src_script_governs.html
diff --git a/dom/security/test/csp/file_worker_src_worker_governs.html b/system/security/content/test/csp/file_worker_src_worker_governs.html
index 93c8f6122..93c8f6122 100644
--- a/dom/security/test/csp/file_worker_src_worker_governs.html
+++ b/system/security/content/test/csp/file_worker_src_worker_governs.html
diff --git a/dom/security/test/csp/mochitest.ini b/system/security/content/test/csp/mochitest.ini
index 86b7fd0cd..86b7fd0cd 100644
--- a/dom/security/test/csp/mochitest.ini
+++ b/system/security/content/test/csp/mochitest.ini
diff --git a/dom/security/test/csp/referrerdirective.sjs b/system/security/content/test/csp/referrerdirective.sjs
index f238ab452..f238ab452 100644
--- a/dom/security/test/csp/referrerdirective.sjs
+++ b/system/security/content/test/csp/referrerdirective.sjs
diff --git a/dom/security/test/csp/test_301_redirect.html b/system/security/content/test/csp/test_301_redirect.html
index 8b625a401..8b625a401 100644
--- a/dom/security/test/csp/test_301_redirect.html
+++ b/system/security/content/test/csp/test_301_redirect.html
diff --git a/dom/security/test/csp/test_302_redirect.html b/system/security/content/test/csp/test_302_redirect.html
index 616ecd9eb..616ecd9eb 100644
--- a/dom/security/test/csp/test_302_redirect.html
+++ b/system/security/content/test/csp/test_302_redirect.html
diff --git a/dom/security/test/csp/test_303_redirect.html b/system/security/content/test/csp/test_303_redirect.html
index 9e59a18f6..9e59a18f6 100644
--- a/dom/security/test/csp/test_303_redirect.html
+++ b/system/security/content/test/csp/test_303_redirect.html
diff --git a/dom/security/test/csp/test_307_redirect.html b/system/security/content/test/csp/test_307_redirect.html
index 5e30b1b86..5e30b1b86 100644
--- a/dom/security/test/csp/test_307_redirect.html
+++ b/system/security/content/test/csp/test_307_redirect.html
diff --git a/dom/security/test/csp/test_CSP.html b/system/security/content/test/csp/test_CSP.html
index 1cde9902d..1cde9902d 100644
--- a/dom/security/test/csp/test_CSP.html
+++ b/system/security/content/test/csp/test_CSP.html
diff --git a/dom/security/test/csp/test_allow_https_schemes.html b/system/security/content/test/csp/test_allow_https_schemes.html
index 713464200..713464200 100644
--- a/dom/security/test/csp/test_allow_https_schemes.html
+++ b/system/security/content/test/csp/test_allow_https_schemes.html
diff --git a/dom/security/test/csp/test_base-uri.html b/system/security/content/test/csp/test_base-uri.html
index 7b8dcf7e2..7b8dcf7e2 100644
--- a/dom/security/test/csp/test_base-uri.html
+++ b/system/security/content/test/csp/test_base-uri.html
diff --git a/dom/security/test/csp/test_blob_data_schemes.html b/system/security/content/test/csp/test_blob_data_schemes.html
index 37b327b10..37b327b10 100644
--- a/dom/security/test/csp/test_blob_data_schemes.html
+++ b/system/security/content/test/csp/test_blob_data_schemes.html
diff --git a/dom/security/test/csp/test_block_all_mixed_content.html b/system/security/content/test/csp/test_block_all_mixed_content.html
index d5c4cda8b..d5c4cda8b 100644
--- a/dom/security/test/csp/test_block_all_mixed_content.html
+++ b/system/security/content/test/csp/test_block_all_mixed_content.html
diff --git a/dom/security/test/csp/test_block_all_mixed_content_frame_navigation.html b/system/security/content/test/csp/test_block_all_mixed_content_frame_navigation.html
index c9d671fd7..c9d671fd7 100644
--- a/dom/security/test/csp/test_block_all_mixed_content_frame_navigation.html
+++ b/system/security/content/test/csp/test_block_all_mixed_content_frame_navigation.html
diff --git a/dom/security/test/csp/test_blocked_uri_in_reports.html b/system/security/content/test/csp/test_blocked_uri_in_reports.html
index f68d8c03f..f68d8c03f 100644
--- a/dom/security/test/csp/test_blocked_uri_in_reports.html
+++ b/system/security/content/test/csp/test_blocked_uri_in_reports.html
diff --git a/dom/security/test/csp/test_bug1229639.html b/system/security/content/test/csp/test_bug1229639.html
index cd322d36d..cd322d36d 100644
--- a/dom/security/test/csp/test_bug1229639.html
+++ b/system/security/content/test/csp/test_bug1229639.html
diff --git a/dom/security/test/csp/test_bug1242019.html b/system/security/content/test/csp/test_bug1242019.html
index d57fa02bf..d57fa02bf 100644
--- a/dom/security/test/csp/test_bug1242019.html
+++ b/system/security/content/test/csp/test_bug1242019.html
diff --git a/dom/security/test/csp/test_bug1312272.html b/system/security/content/test/csp/test_bug1312272.html
index 2cbebb844..2cbebb844 100644
--- a/dom/security/test/csp/test_bug1312272.html
+++ b/system/security/content/test/csp/test_bug1312272.html
diff --git a/dom/security/test/csp/test_bug663567.html b/system/security/content/test/csp/test_bug663567.html
index 293aa2914..293aa2914 100644
--- a/dom/security/test/csp/test_bug663567.html
+++ b/system/security/content/test/csp/test_bug663567.html
diff --git a/dom/security/test/csp/test_bug802872.html b/system/security/content/test/csp/test_bug802872.html
index 70584c14f..70584c14f 100644
--- a/dom/security/test/csp/test_bug802872.html
+++ b/system/security/content/test/csp/test_bug802872.html
diff --git a/dom/security/test/csp/test_bug836922_npolicies.html b/system/security/content/test/csp/test_bug836922_npolicies.html
index 8d0390eed..8d0390eed 100644
--- a/dom/security/test/csp/test_bug836922_npolicies.html
+++ b/system/security/content/test/csp/test_bug836922_npolicies.html
diff --git a/dom/security/test/csp/test_bug885433.html b/system/security/content/test/csp/test_bug885433.html
index 22db0ed24..22db0ed24 100644
--- a/dom/security/test/csp/test_bug885433.html
+++ b/system/security/content/test/csp/test_bug885433.html
diff --git a/dom/security/test/csp/test_bug886164.html b/system/security/content/test/csp/test_bug886164.html
index 74fd98458..74fd98458 100644
--- a/dom/security/test/csp/test_bug886164.html
+++ b/system/security/content/test/csp/test_bug886164.html
diff --git a/dom/security/test/csp/test_bug888172.html b/system/security/content/test/csp/test_bug888172.html
index 200e8c942..200e8c942 100644
--- a/dom/security/test/csp/test_bug888172.html
+++ b/system/security/content/test/csp/test_bug888172.html
diff --git a/dom/security/test/csp/test_bug909029.html b/system/security/content/test/csp/test_bug909029.html
index aebfabf48..aebfabf48 100644
--- a/dom/security/test/csp/test_bug909029.html
+++ b/system/security/content/test/csp/test_bug909029.html
diff --git a/dom/security/test/csp/test_bug910139.html b/system/security/content/test/csp/test_bug910139.html
index 63a7f77d1..63a7f77d1 100644
--- a/dom/security/test/csp/test_bug910139.html
+++ b/system/security/content/test/csp/test_bug910139.html
diff --git a/dom/security/test/csp/test_bug941404.html b/system/security/content/test/csp/test_bug941404.html
index 07f45d176..07f45d176 100644
--- a/dom/security/test/csp/test_bug941404.html
+++ b/system/security/content/test/csp/test_bug941404.html
diff --git a/dom/security/test/csp/test_child-src_iframe.html b/system/security/content/test/csp/test_child-src_iframe.html
index b4ba36f89..b4ba36f89 100644
--- a/dom/security/test/csp/test_child-src_iframe.html
+++ b/system/security/content/test/csp/test_child-src_iframe.html
diff --git a/dom/security/test/csp/test_child-src_worker-redirect.html b/system/security/content/test/csp/test_child-src_worker-redirect.html
index dfb99149c..dfb99149c 100644
--- a/dom/security/test/csp/test_child-src_worker-redirect.html
+++ b/system/security/content/test/csp/test_child-src_worker-redirect.html
diff --git a/dom/security/test/csp/test_child-src_worker.html b/system/security/content/test/csp/test_child-src_worker.html
index ea9e7b28e..ea9e7b28e 100644
--- a/dom/security/test/csp/test_child-src_worker.html
+++ b/system/security/content/test/csp/test_child-src_worker.html
diff --git a/dom/security/test/csp/test_child-src_worker_data.html b/system/security/content/test/csp/test_child-src_worker_data.html
index 089d32dbe..089d32dbe 100644
--- a/dom/security/test/csp/test_child-src_worker_data.html
+++ b/system/security/content/test/csp/test_child-src_worker_data.html
diff --git a/dom/security/test/csp/test_connect-src.html b/system/security/content/test/csp/test_connect-src.html
index 5e42d9838..5e42d9838 100644
--- a/dom/security/test/csp/test_connect-src.html
+++ b/system/security/content/test/csp/test_connect-src.html
diff --git a/dom/security/test/csp/test_docwrite_meta.html b/system/security/content/test/csp/test_docwrite_meta.html
index 26794199a..26794199a 100644
--- a/dom/security/test/csp/test_docwrite_meta.html
+++ b/system/security/content/test/csp/test_docwrite_meta.html
diff --git a/dom/security/test/csp/test_dual_header.html b/system/security/content/test/csp/test_dual_header.html
index 6d3a35fd0..6d3a35fd0 100644
--- a/dom/security/test/csp/test_dual_header.html
+++ b/system/security/content/test/csp/test_dual_header.html
diff --git a/dom/security/test/csp/test_evalscript.html b/system/security/content/test/csp/test_evalscript.html
index f0ec3407c..f0ec3407c 100644
--- a/dom/security/test/csp/test_evalscript.html
+++ b/system/security/content/test/csp/test_evalscript.html
diff --git a/dom/security/test/csp/test_fontloader.html b/system/security/content/test/csp/test_fontloader.html
index cdb177f2a..cdb177f2a 100644
--- a/dom/security/test/csp/test_fontloader.html
+++ b/system/security/content/test/csp/test_fontloader.html
diff --git a/dom/security/test/csp/test_form-action.html b/system/security/content/test/csp/test_form-action.html
index b909ca701..b909ca701 100644
--- a/dom/security/test/csp/test_form-action.html
+++ b/system/security/content/test/csp/test_form-action.html
diff --git a/dom/security/test/csp/test_form_action_blocks_url.html b/system/security/content/test/csp/test_form_action_blocks_url.html
index ef5c8d9b4..ef5c8d9b4 100644
--- a/dom/security/test/csp/test_form_action_blocks_url.html
+++ b/system/security/content/test/csp/test_form_action_blocks_url.html
diff --git a/dom/security/test/csp/test_frame_ancestors_ro.html b/system/security/content/test/csp/test_frame_ancestors_ro.html
index 90f68e25e..90f68e25e 100644
--- a/dom/security/test/csp/test_frame_ancestors_ro.html
+++ b/system/security/content/test/csp/test_frame_ancestors_ro.html
diff --git a/dom/security/test/csp/test_frame_src.html b/system/security/content/test/csp/test_frame_src.html
index 07de90cfa..07de90cfa 100644
--- a/dom/security/test/csp/test_frame_src.html
+++ b/system/security/content/test/csp/test_frame_src.html
diff --git a/dom/security/test/csp/test_frameancestors.html b/system/security/content/test/csp/test_frameancestors.html
index 8ccbc8156..8ccbc8156 100644
--- a/dom/security/test/csp/test_frameancestors.html
+++ b/system/security/content/test/csp/test_frameancestors.html
diff --git a/dom/security/test/csp/test_hash_source.html b/system/security/content/test/csp/test_hash_source.html
index 6dde11dac..6dde11dac 100644
--- a/dom/security/test/csp/test_hash_source.html
+++ b/system/security/content/test/csp/test_hash_source.html
diff --git a/dom/security/test/csp/test_iframe_sandbox.html b/system/security/content/test/csp/test_iframe_sandbox.html
index f79f94135..f79f94135 100644
--- a/dom/security/test/csp/test_iframe_sandbox.html
+++ b/system/security/content/test/csp/test_iframe_sandbox.html
diff --git a/dom/security/test/csp/test_iframe_sandbox_srcdoc.html b/system/security/content/test/csp/test_iframe_sandbox_srcdoc.html
index 53beafcac..53beafcac 100644
--- a/dom/security/test/csp/test_iframe_sandbox_srcdoc.html
+++ b/system/security/content/test/csp/test_iframe_sandbox_srcdoc.html
diff --git a/dom/security/test/csp/test_iframe_sandbox_top_1.html b/system/security/content/test/csp/test_iframe_sandbox_top_1.html
index d9ba71824..d9ba71824 100644
--- a/dom/security/test/csp/test_iframe_sandbox_top_1.html
+++ b/system/security/content/test/csp/test_iframe_sandbox_top_1.html
diff --git a/dom/security/test/csp/test_iframe_sandbox_top_1.html^headers^ b/system/security/content/test/csp/test_iframe_sandbox_top_1.html^headers^
index d9cd0606e..d9cd0606e 100644
--- a/dom/security/test/csp/test_iframe_sandbox_top_1.html^headers^
+++ b/system/security/content/test/csp/test_iframe_sandbox_top_1.html^headers^
diff --git a/dom/security/test/csp/test_iframe_srcdoc.html b/system/security/content/test/csp/test_iframe_srcdoc.html
index 95b924a5e..95b924a5e 100644
--- a/dom/security/test/csp/test_iframe_srcdoc.html
+++ b/system/security/content/test/csp/test_iframe_srcdoc.html
diff --git a/dom/security/test/csp/test_ignore_unsafe_inline.html b/system/security/content/test/csp/test_ignore_unsafe_inline.html
index 50f9cbb8d..50f9cbb8d 100644
--- a/dom/security/test/csp/test_ignore_unsafe_inline.html
+++ b/system/security/content/test/csp/test_ignore_unsafe_inline.html
diff --git a/dom/security/test/csp/test_ignore_xfo.html b/system/security/content/test/csp/test_ignore_xfo.html
index fb3aadc6c..fb3aadc6c 100644
--- a/dom/security/test/csp/test_ignore_xfo.html
+++ b/system/security/content/test/csp/test_ignore_xfo.html
diff --git a/dom/security/test/csp/test_image_nonce.html b/system/security/content/test/csp/test_image_nonce.html
index ff6d636b6..ff6d636b6 100644
--- a/dom/security/test/csp/test_image_nonce.html
+++ b/system/security/content/test/csp/test_image_nonce.html
diff --git a/dom/security/test/csp/test_inlinescript.html b/system/security/content/test/csp/test_inlinescript.html
index 7fd5695d5..7fd5695d5 100644
--- a/dom/security/test/csp/test_inlinescript.html
+++ b/system/security/content/test/csp/test_inlinescript.html
diff --git a/dom/security/test/csp/test_inlinestyle.html b/system/security/content/test/csp/test_inlinestyle.html
index eadcf1e38..eadcf1e38 100644
--- a/dom/security/test/csp/test_inlinestyle.html
+++ b/system/security/content/test/csp/test_inlinestyle.html
diff --git a/dom/security/test/csp/test_invalid_source_expression.html b/system/security/content/test/csp/test_invalid_source_expression.html
index ad0b34999..ad0b34999 100644
--- a/dom/security/test/csp/test_invalid_source_expression.html
+++ b/system/security/content/test/csp/test_invalid_source_expression.html
diff --git a/dom/security/test/csp/test_leading_wildcard.html b/system/security/content/test/csp/test_leading_wildcard.html
index 81c9f58ec..81c9f58ec 100644
--- a/dom/security/test/csp/test_leading_wildcard.html
+++ b/system/security/content/test/csp/test_leading_wildcard.html
diff --git a/dom/security/test/csp/test_meta_element.html b/system/security/content/test/csp/test_meta_element.html
index 98c12fce8..98c12fce8 100644
--- a/dom/security/test/csp/test_meta_element.html
+++ b/system/security/content/test/csp/test_meta_element.html
diff --git a/dom/security/test/csp/test_meta_header_dual.html b/system/security/content/test/csp/test_meta_header_dual.html
index 4d6258d6e..4d6258d6e 100644
--- a/dom/security/test/csp/test_meta_header_dual.html
+++ b/system/security/content/test/csp/test_meta_header_dual.html
diff --git a/dom/security/test/csp/test_meta_whitespace_skipping.html b/system/security/content/test/csp/test_meta_whitespace_skipping.html
index 67c636c3b..67c636c3b 100644
--- a/dom/security/test/csp/test_meta_whitespace_skipping.html
+++ b/system/security/content/test/csp/test_meta_whitespace_skipping.html
diff --git a/dom/security/test/csp/test_multi_policy_injection_bypass.html b/system/security/content/test/csp/test_multi_policy_injection_bypass.html
index 83a9fa265..83a9fa265 100644
--- a/dom/security/test/csp/test_multi_policy_injection_bypass.html
+++ b/system/security/content/test/csp/test_multi_policy_injection_bypass.html
diff --git a/dom/security/test/csp/test_multipartchannel.html b/system/security/content/test/csp/test_multipartchannel.html
index 3dd42783b..3dd42783b 100644
--- a/dom/security/test/csp/test_multipartchannel.html
+++ b/system/security/content/test/csp/test_multipartchannel.html
diff --git a/dom/security/test/csp/test_nonce_redirects.html b/system/security/content/test/csp/test_nonce_redirects.html
index f84fdcc7b..f84fdcc7b 100644
--- a/dom/security/test/csp/test_nonce_redirects.html
+++ b/system/security/content/test/csp/test_nonce_redirects.html
diff --git a/dom/security/test/csp/test_nonce_source.html b/system/security/content/test/csp/test_nonce_source.html
index 73a613576..73a613576 100644
--- a/dom/security/test/csp/test_nonce_source.html
+++ b/system/security/content/test/csp/test_nonce_source.html
diff --git a/dom/security/test/csp/test_null_baseuri.html b/system/security/content/test/csp/test_null_baseuri.html
index 4592d582f..4592d582f 100644
--- a/dom/security/test/csp/test_null_baseuri.html
+++ b/system/security/content/test/csp/test_null_baseuri.html
diff --git a/dom/security/test/csp/test_path_matching.html b/system/security/content/test/csp/test_path_matching.html
index e02751803..e02751803 100644
--- a/dom/security/test/csp/test_path_matching.html
+++ b/system/security/content/test/csp/test_path_matching.html
diff --git a/dom/security/test/csp/test_path_matching_redirect.html b/system/security/content/test/csp/test_path_matching_redirect.html
index 7d1044052..7d1044052 100644
--- a/dom/security/test/csp/test_path_matching_redirect.html
+++ b/system/security/content/test/csp/test_path_matching_redirect.html
diff --git a/dom/security/test/csp/test_ping.html b/system/security/content/test/csp/test_ping.html
index a896794e1..a896794e1 100644
--- a/dom/security/test/csp/test_ping.html
+++ b/system/security/content/test/csp/test_ping.html
diff --git a/dom/security/test/csp/test_policyuri_regression_from_multipolicy.html b/system/security/content/test/csp/test_policyuri_regression_from_multipolicy.html
index f69e8f558..f69e8f558 100644
--- a/dom/security/test/csp/test_policyuri_regression_from_multipolicy.html
+++ b/system/security/content/test/csp/test_policyuri_regression_from_multipolicy.html
diff --git a/dom/security/test/csp/test_punycode_host_src.html b/system/security/content/test/csp/test_punycode_host_src.html
index 8d891725c..8d891725c 100644
--- a/dom/security/test/csp/test_punycode_host_src.html
+++ b/system/security/content/test/csp/test_punycode_host_src.html
diff --git a/dom/security/test/csp/test_redirects.html b/system/security/content/test/csp/test_redirects.html
index df01e3b41..df01e3b41 100644
--- a/dom/security/test/csp/test_redirects.html
+++ b/system/security/content/test/csp/test_redirects.html
diff --git a/dom/security/test/csp/test_referrerdirective.html b/system/security/content/test/csp/test_referrerdirective.html
index f590460a0..f590460a0 100644
--- a/dom/security/test/csp/test_referrerdirective.html
+++ b/system/security/content/test/csp/test_referrerdirective.html
diff --git a/dom/security/test/csp/test_report.html b/system/security/content/test/csp/test_report.html
index e8cfb8778..e8cfb8778 100644
--- a/dom/security/test/csp/test_report.html
+++ b/system/security/content/test/csp/test_report.html
diff --git a/dom/security/test/csp/test_report_for_import.html b/system/security/content/test/csp/test_report_for_import.html
index be112d51c..be112d51c 100644
--- a/dom/security/test/csp/test_report_for_import.html
+++ b/system/security/content/test/csp/test_report_for_import.html
diff --git a/dom/security/test/csp/test_report_uri_missing_in_report_only_header.html b/system/security/content/test/csp/test_report_uri_missing_in_report_only_header.html
index d02911141..d02911141 100644
--- a/dom/security/test/csp/test_report_uri_missing_in_report_only_header.html
+++ b/system/security/content/test/csp/test_report_uri_missing_in_report_only_header.html
diff --git a/dom/security/test/csp/test_require_sri_meta.html b/system/security/content/test/csp/test_require_sri_meta.html
index a06fe122a..a06fe122a 100644
--- a/dom/security/test/csp/test_require_sri_meta.html
+++ b/system/security/content/test/csp/test_require_sri_meta.html
diff --git a/dom/security/test/csp/test_sandbox.html b/system/security/content/test/csp/test_sandbox.html
index f0df66d6a..f0df66d6a 100644
--- a/dom/security/test/csp/test_sandbox.html
+++ b/system/security/content/test/csp/test_sandbox.html
diff --git a/dom/security/test/csp/test_sandbox_allow_scripts.html b/system/security/content/test/csp/test_sandbox_allow_scripts.html
index 10acaae43..10acaae43 100644
--- a/dom/security/test/csp/test_sandbox_allow_scripts.html
+++ b/system/security/content/test/csp/test_sandbox_allow_scripts.html
diff --git a/dom/security/test/csp/test_scheme_relative_sources.html b/system/security/content/test/csp/test_scheme_relative_sources.html
index 21271cdd1..21271cdd1 100644
--- a/dom/security/test/csp/test_scheme_relative_sources.html
+++ b/system/security/content/test/csp/test_scheme_relative_sources.html
diff --git a/dom/security/test/csp/test_self_none_as_hostname_confusion.html b/system/security/content/test/csp/test_self_none_as_hostname_confusion.html
index e5b93c538..e5b93c538 100644
--- a/dom/security/test/csp/test_self_none_as_hostname_confusion.html
+++ b/system/security/content/test/csp/test_self_none_as_hostname_confusion.html
diff --git a/dom/security/test/csp/test_sendbeacon.html b/system/security/content/test/csp/test_sendbeacon.html
index 1b4cfbc86..1b4cfbc86 100644
--- a/dom/security/test/csp/test_sendbeacon.html
+++ b/system/security/content/test/csp/test_sendbeacon.html
diff --git a/dom/security/test/csp/test_service_worker.html b/system/security/content/test/csp/test_service_worker.html
index 0cff84751..0cff84751 100644
--- a/dom/security/test/csp/test_service_worker.html
+++ b/system/security/content/test/csp/test_service_worker.html
diff --git a/dom/security/test/csp/test_shouldprocess.html b/system/security/content/test/csp/test_shouldprocess.html
index 5d0925167..5d0925167 100644
--- a/dom/security/test/csp/test_shouldprocess.html
+++ b/system/security/content/test/csp/test_shouldprocess.html
diff --git a/dom/security/test/csp/test_strict_dynamic.html b/system/security/content/test/csp/test_strict_dynamic.html
index 8f1b53f31..8f1b53f31 100644
--- a/dom/security/test/csp/test_strict_dynamic.html
+++ b/system/security/content/test/csp/test_strict_dynamic.html
diff --git a/dom/security/test/csp/test_strict_dynamic_default_src.html b/system/security/content/test/csp/test_strict_dynamic_default_src.html
index 17518444e..17518444e 100644
--- a/dom/security/test/csp/test_strict_dynamic_default_src.html
+++ b/system/security/content/test/csp/test_strict_dynamic_default_src.html
diff --git a/dom/security/test/csp/test_strict_dynamic_parser_inserted.html b/system/security/content/test/csp/test_strict_dynamic_parser_inserted.html
index 9e588660d..9e588660d 100644
--- a/dom/security/test/csp/test_strict_dynamic_parser_inserted.html
+++ b/system/security/content/test/csp/test_strict_dynamic_parser_inserted.html
diff --git a/dom/security/test/csp/test_subframe_run_js_if_allowed.html b/system/security/content/test/csp/test_subframe_run_js_if_allowed.html
index ccc81a265..ccc81a265 100644
--- a/dom/security/test/csp/test_subframe_run_js_if_allowed.html
+++ b/system/security/content/test/csp/test_subframe_run_js_if_allowed.html
diff --git a/dom/security/test/csp/test_upgrade_insecure.html b/system/security/content/test/csp/test_upgrade_insecure.html
index a2b99b8db..a2b99b8db 100644
--- a/dom/security/test/csp/test_upgrade_insecure.html
+++ b/system/security/content/test/csp/test_upgrade_insecure.html
diff --git a/dom/security/test/csp/test_upgrade_insecure_cors.html b/system/security/content/test/csp/test_upgrade_insecure_cors.html
index af296983c..af296983c 100644
--- a/dom/security/test/csp/test_upgrade_insecure_cors.html
+++ b/system/security/content/test/csp/test_upgrade_insecure_cors.html
diff --git a/dom/security/test/csp/test_upgrade_insecure_docwrite_iframe.html b/system/security/content/test/csp/test_upgrade_insecure_docwrite_iframe.html
index 822158bd7..822158bd7 100644
--- a/dom/security/test/csp/test_upgrade_insecure_docwrite_iframe.html
+++ b/system/security/content/test/csp/test_upgrade_insecure_docwrite_iframe.html
diff --git a/dom/security/test/csp/test_upgrade_insecure_navigation.html b/system/security/content/test/csp/test_upgrade_insecure_navigation.html
index db6a6a1be..db6a6a1be 100644
--- a/dom/security/test/csp/test_upgrade_insecure_navigation.html
+++ b/system/security/content/test/csp/test_upgrade_insecure_navigation.html
diff --git a/dom/security/test/csp/test_upgrade_insecure_referrer.html b/system/security/content/test/csp/test_upgrade_insecure_referrer.html
index 890c57335..890c57335 100644
--- a/dom/security/test/csp/test_upgrade_insecure_referrer.html
+++ b/system/security/content/test/csp/test_upgrade_insecure_referrer.html
diff --git a/dom/security/test/csp/test_upgrade_insecure_reporting.html b/system/security/content/test/csp/test_upgrade_insecure_reporting.html
index 967654179..967654179 100644
--- a/dom/security/test/csp/test_upgrade_insecure_reporting.html
+++ b/system/security/content/test/csp/test_upgrade_insecure_reporting.html
diff --git a/dom/security/test/csp/test_websocket_self.html b/system/security/content/test/csp/test_websocket_self.html
index a03c32704..a03c32704 100644
--- a/dom/security/test/csp/test_websocket_self.html
+++ b/system/security/content/test/csp/test_websocket_self.html
diff --git a/dom/security/test/csp/test_worker_src.html b/system/security/content/test/csp/test_worker_src.html
index 3f2b44c9f..3f2b44c9f 100644
--- a/dom/security/test/csp/test_worker_src.html
+++ b/system/security/content/test/csp/test_worker_src.html
diff --git a/dom/security/test/general/browser.ini b/system/security/content/test/general/browser.ini
index b00baa95d..b00baa95d 100644
--- a/dom/security/test/general/browser.ini
+++ b/system/security/content/test/general/browser.ini
diff --git a/dom/security/test/general/browser_test_data_download.js b/system/security/content/test/general/browser_test_data_download.js
index 1ee8d5844..1ee8d5844 100644
--- a/dom/security/test/general/browser_test_data_download.js
+++ b/system/security/content/test/general/browser_test_data_download.js
diff --git a/dom/security/test/general/browser_test_data_text_csv.js b/system/security/content/test/general/browser_test_data_text_csv.js
index c45e40cc2..c45e40cc2 100644
--- a/dom/security/test/general/browser_test_data_text_csv.js
+++ b/system/security/content/test/general/browser_test_data_text_csv.js
diff --git a/dom/security/test/general/browser_test_toplevel_data_navigations.js b/system/security/content/test/general/browser_test_toplevel_data_navigations.js
index a13a6350e..a13a6350e 100644
--- a/dom/security/test/general/browser_test_toplevel_data_navigations.js
+++ b/system/security/content/test/general/browser_test_toplevel_data_navigations.js
diff --git a/dom/security/test/general/browser_test_view_image_data_navigation.js b/system/security/content/test/general/browser_test_view_image_data_navigation.js
index 22de35894..22de35894 100644
--- a/dom/security/test/general/browser_test_view_image_data_navigation.js
+++ b/system/security/content/test/general/browser_test_view_image_data_navigation.js
diff --git a/dom/security/test/general/bug1277803.html b/system/security/content/test/general/bug1277803.html
index c8033551a..c8033551a 100644
--- a/dom/security/test/general/bug1277803.html
+++ b/system/security/content/test/general/bug1277803.html
diff --git a/dom/security/test/general/chrome.ini b/system/security/content/test/general/chrome.ini
index 94bf1ef05..94bf1ef05 100644
--- a/dom/security/test/general/chrome.ini
+++ b/system/security/content/test/general/chrome.ini
diff --git a/dom/security/test/general/favicon_bug1277803.ico b/system/security/content/test/general/favicon_bug1277803.ico
index d44438903..d44438903 100644
--- a/dom/security/test/general/favicon_bug1277803.ico
+++ b/system/security/content/test/general/favicon_bug1277803.ico
diff --git a/dom/security/test/general/file_block_script_wrong_mime_server.sjs b/system/security/content/test/general/file_block_script_wrong_mime_server.sjs
index d6d27796c..d6d27796c 100644
--- a/dom/security/test/general/file_block_script_wrong_mime_server.sjs
+++ b/system/security/content/test/general/file_block_script_wrong_mime_server.sjs
diff --git a/dom/security/test/general/file_block_toplevel_data_navigation.html b/system/security/content/test/general/file_block_toplevel_data_navigation.html
index 5fbfdfdef..5fbfdfdef 100644
--- a/dom/security/test/general/file_block_toplevel_data_navigation.html
+++ b/system/security/content/test/general/file_block_toplevel_data_navigation.html
diff --git a/dom/security/test/general/file_block_toplevel_data_navigation2.html b/system/security/content/test/general/file_block_toplevel_data_navigation2.html
index e0308e1ae..e0308e1ae 100644
--- a/dom/security/test/general/file_block_toplevel_data_navigation2.html
+++ b/system/security/content/test/general/file_block_toplevel_data_navigation2.html
diff --git a/dom/security/test/general/file_block_toplevel_data_navigation3.html b/system/security/content/test/general/file_block_toplevel_data_navigation3.html
index 34aeddab3..34aeddab3 100644
--- a/dom/security/test/general/file_block_toplevel_data_navigation3.html
+++ b/system/security/content/test/general/file_block_toplevel_data_navigation3.html
diff --git a/dom/security/test/general/file_block_toplevel_data_redirect.sjs b/system/security/content/test/general/file_block_toplevel_data_redirect.sjs
index 64e294cab..64e294cab 100644
--- a/dom/security/test/general/file_block_toplevel_data_redirect.sjs
+++ b/system/security/content/test/general/file_block_toplevel_data_redirect.sjs
diff --git a/dom/security/test/general/file_contentpolicytype_targeted_link_iframe.sjs b/system/security/content/test/general/file_contentpolicytype_targeted_link_iframe.sjs
index f0084410a..f0084410a 100644
--- a/dom/security/test/general/file_contentpolicytype_targeted_link_iframe.sjs
+++ b/system/security/content/test/general/file_contentpolicytype_targeted_link_iframe.sjs
diff --git a/dom/security/test/general/file_data_download.html b/system/security/content/test/general/file_data_download.html
index 4cc92fe8f..4cc92fe8f 100644
--- a/dom/security/test/general/file_data_download.html
+++ b/system/security/content/test/general/file_data_download.html
diff --git a/dom/security/test/general/file_data_text_csv.html b/system/security/content/test/general/file_data_text_csv.html
index a9ac369d1..a9ac369d1 100644
--- a/dom/security/test/general/file_data_text_csv.html
+++ b/system/security/content/test/general/file_data_text_csv.html
diff --git a/dom/security/test/general/file_nosniff_testserver.sjs b/system/security/content/test/general/file_nosniff_testserver.sjs
index 0cf168a3c..0cf168a3c 100644
--- a/dom/security/test/general/file_nosniff_testserver.sjs
+++ b/system/security/content/test/general/file_nosniff_testserver.sjs
diff --git a/dom/security/test/general/file_toplevel_data_meta_redirect.html b/system/security/content/test/general/file_toplevel_data_meta_redirect.html
index f4f5deb52..f4f5deb52 100644
--- a/dom/security/test/general/file_toplevel_data_meta_redirect.html
+++ b/system/security/content/test/general/file_toplevel_data_meta_redirect.html
diff --git a/dom/security/test/general/file_toplevel_data_navigations.sjs b/system/security/content/test/general/file_toplevel_data_navigations.sjs
index 501b833e5..501b833e5 100644
--- a/dom/security/test/general/file_toplevel_data_navigations.sjs
+++ b/system/security/content/test/general/file_toplevel_data_navigations.sjs
diff --git a/dom/security/test/general/file_view_image_data_navigation.html b/system/security/content/test/general/file_view_image_data_navigation.html
index a3f9acfb4..a3f9acfb4 100644
--- a/dom/security/test/general/file_view_image_data_navigation.html
+++ b/system/security/content/test/general/file_view_image_data_navigation.html
diff --git a/dom/security/test/general/mochitest.ini b/system/security/content/test/general/mochitest.ini
index f3bcca072..f3bcca072 100644
--- a/dom/security/test/general/mochitest.ini
+++ b/system/security/content/test/general/mochitest.ini
diff --git a/dom/security/test/general/test_allow_opening_data_json.html b/system/security/content/test/general/test_allow_opening_data_json.html
index 1530a24e8..1530a24e8 100644
--- a/dom/security/test/general/test_allow_opening_data_json.html
+++ b/system/security/content/test/general/test_allow_opening_data_json.html
diff --git a/dom/security/test/general/test_allow_opening_data_pdf.html b/system/security/content/test/general/test_allow_opening_data_pdf.html
index 6b51fe57b..6b51fe57b 100644
--- a/dom/security/test/general/test_allow_opening_data_pdf.html
+++ b/system/security/content/test/general/test_allow_opening_data_pdf.html
diff --git a/dom/security/test/general/test_block_script_wrong_mime.html b/system/security/content/test/general/test_block_script_wrong_mime.html
index 34d4b621b..34d4b621b 100644
--- a/dom/security/test/general/test_block_script_wrong_mime.html
+++ b/system/security/content/test/general/test_block_script_wrong_mime.html
diff --git a/dom/security/test/general/test_block_toplevel_data_img_navigation.html b/system/security/content/test/general/test_block_toplevel_data_img_navigation.html
index 7f8dfc748..7f8dfc748 100644
--- a/dom/security/test/general/test_block_toplevel_data_img_navigation.html
+++ b/system/security/content/test/general/test_block_toplevel_data_img_navigation.html
diff --git a/dom/security/test/general/test_block_toplevel_data_navigation.html b/system/security/content/test/general/test_block_toplevel_data_navigation.html
index cef232b65..cef232b65 100644
--- a/dom/security/test/general/test_block_toplevel_data_navigation.html
+++ b/system/security/content/test/general/test_block_toplevel_data_navigation.html
diff --git a/dom/security/test/general/test_bug1277803.xul b/system/security/content/test/general/test_bug1277803.xul
index a62285f8a..a62285f8a 100644
--- a/dom/security/test/general/test_bug1277803.xul
+++ b/system/security/content/test/general/test_bug1277803.xul
diff --git a/dom/security/test/general/test_contentpolicytype_targeted_link_iframe.html b/system/security/content/test/general/test_contentpolicytype_targeted_link_iframe.html
index 3ef243824..3ef243824 100644
--- a/dom/security/test/general/test_contentpolicytype_targeted_link_iframe.html
+++ b/system/security/content/test/general/test_contentpolicytype_targeted_link_iframe.html
diff --git a/dom/security/test/general/test_nosniff.html b/system/security/content/test/general/test_nosniff.html
index 197251e68..197251e68 100644
--- a/dom/security/test/general/test_nosniff.html
+++ b/system/security/content/test/general/test_nosniff.html
diff --git a/dom/security/test/gtest/TestCSPParser.cpp b/system/security/content/test/gtest/TestCSPParser.cpp
index 7964bf43a..7964bf43a 100644
--- a/dom/security/test/gtest/TestCSPParser.cpp
+++ b/system/security/content/test/gtest/TestCSPParser.cpp
diff --git a/dom/security/test/gtest/moz.build b/system/security/content/test/gtest/moz.build
index 2ed0a56a4..2ed0a56a4 100644
--- a/dom/security/test/gtest/moz.build
+++ b/system/security/content/test/gtest/moz.build
diff --git a/dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html b/system/security/content/test/mixedcontentblocker/file_bug803225_test_mailto.html
index f1459d366..f1459d366 100644
--- a/dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
+++ b/system/security/content/test/mixedcontentblocker/file_bug803225_test_mailto.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation.html
index fd9ea2317..fd9ea2317 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
index 5cfd95984..5cfd95984 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation_grandchild.html
index 1034991da..1034991da 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation_grandchild.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation_innermost.html
index 62b24f37d..62b24f37d 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation_innermost.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation_secure.html
index ea8462c39..ea8462c39 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation_secure.html
diff --git a/dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html b/system/security/content/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
index f7f3c4086..f7f3c4086 100644
--- a/dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
+++ b/system/security/content/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
diff --git a/dom/security/test/mixedcontentblocker/file_main.html b/system/security/content/test/mixedcontentblocker/file_main.html
index ade5eefdb..ade5eefdb 100644
--- a/dom/security/test/mixedcontentblocker/file_main.html
+++ b/system/security/content/test/mixedcontentblocker/file_main.html
diff --git a/dom/security/test/mixedcontentblocker/file_main_bug803225.html b/system/security/content/test/mixedcontentblocker/file_main_bug803225.html
index e657be256..e657be256 100644
--- a/dom/security/test/mixedcontentblocker/file_main_bug803225.html
+++ b/system/security/content/test/mixedcontentblocker/file_main_bug803225.html
diff --git a/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py b/system/security/content/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
index 8c33c6b10..8c33c6b10 100644
--- a/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
+++ b/system/security/content/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
diff --git a/dom/security/test/mixedcontentblocker/file_server.sjs b/system/security/content/test/mixedcontentblocker/file_server.sjs
index 58dffc565..58dffc565 100644
--- a/dom/security/test/mixedcontentblocker/file_server.sjs
+++ b/system/security/content/test/mixedcontentblocker/file_server.sjs
diff --git a/dom/security/test/mixedcontentblocker/mochitest.ini b/system/security/content/test/mixedcontentblocker/mochitest.ini
index 94c17f9b4..94c17f9b4 100644
--- a/dom/security/test/mixedcontentblocker/mochitest.ini
+++ b/system/security/content/test/mixedcontentblocker/mochitest.ini
diff --git a/dom/security/test/mixedcontentblocker/test_bug803225.html b/system/security/content/test/mixedcontentblocker/test_bug803225.html
index 13c52762d..13c52762d 100644
--- a/dom/security/test/mixedcontentblocker/test_bug803225.html
+++ b/system/security/content/test/mixedcontentblocker/test_bug803225.html
diff --git a/dom/security/test/mixedcontentblocker/test_frameNavigation.html b/system/security/content/test/mixedcontentblocker/test_frameNavigation.html
index 5b3ae50b0..5b3ae50b0 100644
--- a/dom/security/test/mixedcontentblocker/test_frameNavigation.html
+++ b/system/security/content/test/mixedcontentblocker/test_frameNavigation.html
diff --git a/dom/security/test/mixedcontentblocker/test_main.html b/system/security/content/test/mixedcontentblocker/test_main.html
index bb9536939..bb9536939 100644
--- a/dom/security/test/mixedcontentblocker/test_main.html
+++ b/system/security/content/test/mixedcontentblocker/test_main.html
diff --git a/dom/security/test/moz.build b/system/security/content/test/moz.build
index b8829463b..b8829463b 100644
--- a/dom/security/test/moz.build
+++ b/system/security/content/test/moz.build
diff --git a/dom/security/test/sri/file_bug_1271796.css b/system/security/content/test/sri/file_bug_1271796.css
index c0928f2cf..c0928f2cf 100644
--- a/dom/security/test/sri/file_bug_1271796.css
+++ b/system/security/content/test/sri/file_bug_1271796.css
diff --git a/dom/security/test/sri/iframe_csp_directive_style_imports.html b/system/security/content/test/sri/iframe_csp_directive_style_imports.html
index 0abea7854..0abea7854 100644
--- a/dom/security/test/sri/iframe_csp_directive_style_imports.html
+++ b/system/security/content/test/sri/iframe_csp_directive_style_imports.html
diff --git a/dom/security/test/sri/iframe_csp_directive_style_imports.html^headers^ b/system/security/content/test/sri/iframe_csp_directive_style_imports.html^headers^
index 0a6ccba79..0a6ccba79 100644
--- a/dom/security/test/sri/iframe_csp_directive_style_imports.html^headers^
+++ b/system/security/content/test/sri/iframe_csp_directive_style_imports.html^headers^
diff --git a/dom/security/test/sri/iframe_require-sri-for_main.html b/system/security/content/test/sri/iframe_require-sri-for_main.html
index 467c699c7..467c699c7 100644
--- a/dom/security/test/sri/iframe_require-sri-for_main.html
+++ b/system/security/content/test/sri/iframe_require-sri-for_main.html
diff --git a/dom/security/test/sri/iframe_require-sri-for_main.html^headers^ b/system/security/content/test/sri/iframe_require-sri-for_main.html^headers^
index 0a6ccba79..0a6ccba79 100644
--- a/dom/security/test/sri/iframe_require-sri-for_main.html^headers^
+++ b/system/security/content/test/sri/iframe_require-sri-for_main.html^headers^
diff --git a/dom/security/test/sri/iframe_require-sri-for_no_csp.html b/system/security/content/test/sri/iframe_require-sri-for_no_csp.html
index 435b32ea3..435b32ea3 100644
--- a/dom/security/test/sri/iframe_require-sri-for_no_csp.html
+++ b/system/security/content/test/sri/iframe_require-sri-for_no_csp.html
diff --git a/dom/security/test/sri/iframe_script_crossdomain.html b/system/security/content/test/sri/iframe_script_crossdomain.html
index a752c7e79..a752c7e79 100644
--- a/dom/security/test/sri/iframe_script_crossdomain.html
+++ b/system/security/content/test/sri/iframe_script_crossdomain.html
diff --git a/dom/security/test/sri/iframe_script_sameorigin.html b/system/security/content/test/sri/iframe_script_sameorigin.html
index b891db547..b891db547 100644
--- a/dom/security/test/sri/iframe_script_sameorigin.html
+++ b/system/security/content/test/sri/iframe_script_sameorigin.html
diff --git a/dom/security/test/sri/iframe_sri_disabled.html b/system/security/content/test/sri/iframe_sri_disabled.html
index 9fb10293a..9fb10293a 100644
--- a/dom/security/test/sri/iframe_sri_disabled.html
+++ b/system/security/content/test/sri/iframe_sri_disabled.html
diff --git a/dom/security/test/sri/iframe_style_crossdomain.html b/system/security/content/test/sri/iframe_style_crossdomain.html
index 22c8593b5..22c8593b5 100644
--- a/dom/security/test/sri/iframe_style_crossdomain.html
+++ b/system/security/content/test/sri/iframe_style_crossdomain.html
diff --git a/dom/security/test/sri/iframe_style_sameorigin.html b/system/security/content/test/sri/iframe_style_sameorigin.html
index d994e7c2b..d994e7c2b 100644
--- a/dom/security/test/sri/iframe_style_sameorigin.html
+++ b/system/security/content/test/sri/iframe_style_sameorigin.html
diff --git a/dom/security/test/sri/mochitest.ini b/system/security/content/test/sri/mochitest.ini
index e6e2e2fc3..e6e2e2fc3 100644
--- a/dom/security/test/sri/mochitest.ini
+++ b/system/security/content/test/sri/mochitest.ini
diff --git a/dom/security/test/sri/rsf_csp_worker.js b/system/security/content/test/sri/rsf_csp_worker.js
index 553fdf92b..553fdf92b 100644
--- a/dom/security/test/sri/rsf_csp_worker.js
+++ b/system/security/content/test/sri/rsf_csp_worker.js
diff --git a/dom/security/test/sri/rsf_csp_worker.js^headers^ b/system/security/content/test/sri/rsf_csp_worker.js^headers^
index 0a6ccba79..0a6ccba79 100644
--- a/dom/security/test/sri/rsf_csp_worker.js^headers^
+++ b/system/security/content/test/sri/rsf_csp_worker.js^headers^
diff --git a/dom/security/test/sri/rsf_imported.js b/system/security/content/test/sri/rsf_imported.js
index 33f54b7a0..33f54b7a0 100644
--- a/dom/security/test/sri/rsf_imported.js
+++ b/system/security/content/test/sri/rsf_imported.js
diff --git a/dom/security/test/sri/rsf_spawn_CSPd_worker.js b/system/security/content/test/sri/rsf_spawn_CSPd_worker.js
index 652c77100..652c77100 100644
--- a/dom/security/test/sri/rsf_spawn_CSPd_worker.js
+++ b/system/security/content/test/sri/rsf_spawn_CSPd_worker.js
diff --git a/dom/security/test/sri/rsf_worker.js b/system/security/content/test/sri/rsf_worker.js
index 553d3deee..553d3deee 100644
--- a/dom/security/test/sri/rsf_worker.js
+++ b/system/security/content/test/sri/rsf_worker.js
diff --git a/dom/security/test/sri/script.js b/system/security/content/test/sri/script.js
index 8fd8f96b2..8fd8f96b2 100644
--- a/dom/security/test/sri/script.js
+++ b/system/security/content/test/sri/script.js
diff --git a/dom/security/test/sri/script.js^headers^ b/system/security/content/test/sri/script.js^headers^
index b77232d81..b77232d81 100644
--- a/dom/security/test/sri/script.js^headers^
+++ b/system/security/content/test/sri/script.js^headers^
diff --git a/dom/security/test/sri/script_301.js b/system/security/content/test/sri/script_301.js
index 9a95de77c..9a95de77c 100644
--- a/dom/security/test/sri/script_301.js
+++ b/system/security/content/test/sri/script_301.js
diff --git a/dom/security/test/sri/script_301.js^headers^ b/system/security/content/test/sri/script_301.js^headers^
index efbfb7334..efbfb7334 100644
--- a/dom/security/test/sri/script_301.js^headers^
+++ b/system/security/content/test/sri/script_301.js^headers^
diff --git a/dom/security/test/sri/script_302.js b/system/security/content/test/sri/script_302.js
index 9a95de77c..9a95de77c 100644
--- a/dom/security/test/sri/script_302.js
+++ b/system/security/content/test/sri/script_302.js
diff --git a/dom/security/test/sri/script_302.js^headers^ b/system/security/content/test/sri/script_302.js^headers^
index 05a545a6a..05a545a6a 100644
--- a/dom/security/test/sri/script_302.js^headers^
+++ b/system/security/content/test/sri/script_302.js^headers^
diff --git a/dom/security/test/sri/script_401.js b/system/security/content/test/sri/script_401.js
index 8fd8f96b2..8fd8f96b2 100644
--- a/dom/security/test/sri/script_401.js
+++ b/system/security/content/test/sri/script_401.js
diff --git a/dom/security/test/sri/script_401.js^headers^ b/system/security/content/test/sri/script_401.js^headers^
index 889fbe081..889fbe081 100644
--- a/dom/security/test/sri/script_401.js^headers^
+++ b/system/security/content/test/sri/script_401.js^headers^
diff --git a/dom/security/test/sri/script_crossdomain1.js b/system/security/content/test/sri/script_crossdomain1.js
index 1f17a6db2..1f17a6db2 100644
--- a/dom/security/test/sri/script_crossdomain1.js
+++ b/system/security/content/test/sri/script_crossdomain1.js
diff --git a/dom/security/test/sri/script_crossdomain1.js^headers^ b/system/security/content/test/sri/script_crossdomain1.js^headers^
index 3a6a85d89..3a6a85d89 100644
--- a/dom/security/test/sri/script_crossdomain1.js^headers^
+++ b/system/security/content/test/sri/script_crossdomain1.js^headers^
diff --git a/dom/security/test/sri/script_crossdomain2.js b/system/security/content/test/sri/script_crossdomain2.js
index 4b0208ab3..4b0208ab3 100644
--- a/dom/security/test/sri/script_crossdomain2.js
+++ b/system/security/content/test/sri/script_crossdomain2.js
diff --git a/dom/security/test/sri/script_crossdomain3.js b/system/security/content/test/sri/script_crossdomain3.js
index eed05d59b..eed05d59b 100644
--- a/dom/security/test/sri/script_crossdomain3.js
+++ b/system/security/content/test/sri/script_crossdomain3.js
diff --git a/dom/security/test/sri/script_crossdomain3.js^headers^ b/system/security/content/test/sri/script_crossdomain3.js^headers^
index 3a6a85d89..3a6a85d89 100644
--- a/dom/security/test/sri/script_crossdomain3.js^headers^
+++ b/system/security/content/test/sri/script_crossdomain3.js^headers^
diff --git a/dom/security/test/sri/script_crossdomain4.js b/system/security/content/test/sri/script_crossdomain4.js
index eed05d59b..eed05d59b 100644
--- a/dom/security/test/sri/script_crossdomain4.js
+++ b/system/security/content/test/sri/script_crossdomain4.js
diff --git a/dom/security/test/sri/script_crossdomain4.js^headers^ b/system/security/content/test/sri/script_crossdomain4.js^headers^
index 3a6a85d89..3a6a85d89 100644
--- a/dom/security/test/sri/script_crossdomain4.js^headers^
+++ b/system/security/content/test/sri/script_crossdomain4.js^headers^
diff --git a/dom/security/test/sri/script_crossdomain5.js b/system/security/content/test/sri/script_crossdomain5.js
index eed05d59b..eed05d59b 100644
--- a/dom/security/test/sri/script_crossdomain5.js
+++ b/system/security/content/test/sri/script_crossdomain5.js
diff --git a/dom/security/test/sri/script_crossdomain5.js^headers^ b/system/security/content/test/sri/script_crossdomain5.js^headers^
index cb762eff8..cb762eff8 100644
--- a/dom/security/test/sri/script_crossdomain5.js^headers^
+++ b/system/security/content/test/sri/script_crossdomain5.js^headers^
diff --git a/dom/security/test/sri/style1.css b/system/security/content/test/sri/style1.css
index c7ab9ecff..c7ab9ecff 100644
--- a/dom/security/test/sri/style1.css
+++ b/system/security/content/test/sri/style1.css
diff --git a/dom/security/test/sri/style1.css^headers^ b/system/security/content/test/sri/style1.css^headers^
index 3a6a85d89..3a6a85d89 100644
--- a/dom/security/test/sri/style1.css^headers^
+++ b/system/security/content/test/sri/style1.css^headers^
diff --git a/dom/security/test/sri/style2.css b/system/security/content/test/sri/style2.css
index 9eece75e5..9eece75e5 100644
--- a/dom/security/test/sri/style2.css
+++ b/system/security/content/test/sri/style2.css
diff --git a/dom/security/test/sri/style3.css b/system/security/content/test/sri/style3.css
index b64fa3b74..b64fa3b74 100644
--- a/dom/security/test/sri/style3.css
+++ b/system/security/content/test/sri/style3.css
diff --git a/dom/security/test/sri/style4.css b/system/security/content/test/sri/style4.css
index eab83656e..eab83656e 100644
--- a/dom/security/test/sri/style4.css
+++ b/system/security/content/test/sri/style4.css
diff --git a/dom/security/test/sri/style4.css^headers^ b/system/security/content/test/sri/style4.css^headers^
index e13897f15..e13897f15 100644
--- a/dom/security/test/sri/style4.css^headers^
+++ b/system/security/content/test/sri/style4.css^headers^
diff --git a/dom/security/test/sri/style5.css b/system/security/content/test/sri/style5.css
index 5d59134cc..5d59134cc 100644
--- a/dom/security/test/sri/style5.css
+++ b/system/security/content/test/sri/style5.css
diff --git a/dom/security/test/sri/style6.css b/system/security/content/test/sri/style6.css
index 569557694..569557694 100644
--- a/dom/security/test/sri/style6.css
+++ b/system/security/content/test/sri/style6.css
diff --git a/dom/security/test/sri/style6.css^headers^ b/system/security/content/test/sri/style6.css^headers^
index d866aa522..d866aa522 100644
--- a/dom/security/test/sri/style6.css^headers^
+++ b/system/security/content/test/sri/style6.css^headers^
diff --git a/dom/security/test/sri/style_301.css b/system/security/content/test/sri/style_301.css
index c7ab9ecff..c7ab9ecff 100644
--- a/dom/security/test/sri/style_301.css
+++ b/system/security/content/test/sri/style_301.css
diff --git a/dom/security/test/sri/style_301.css^headers^ b/system/security/content/test/sri/style_301.css^headers^
index c5b78ee04..c5b78ee04 100644
--- a/dom/security/test/sri/style_301.css^headers^
+++ b/system/security/content/test/sri/style_301.css^headers^
diff --git a/dom/security/test/sri/style_imported.css b/system/security/content/test/sri/style_imported.css
index 4469e8d78..4469e8d78 100644
--- a/dom/security/test/sri/style_imported.css
+++ b/system/security/content/test/sri/style_imported.css
diff --git a/dom/security/test/sri/style_importing.css b/system/security/content/test/sri/style_importing.css
index 985dd3467..985dd3467 100644
--- a/dom/security/test/sri/style_importing.css
+++ b/system/security/content/test/sri/style_importing.css
diff --git a/dom/security/test/sri/test_bug_1271796.html b/system/security/content/test/sri/test_bug_1271796.html
index 1d639c9cb..1d639c9cb 100644
--- a/dom/security/test/sri/test_bug_1271796.html
+++ b/system/security/content/test/sri/test_bug_1271796.html
diff --git a/dom/security/test/sri/test_csp_directive_style_imports.html b/system/security/content/test/sri/test_csp_directive_style_imports.html
index f293e2412..f293e2412 100644
--- a/dom/security/test/sri/test_csp_directive_style_imports.html
+++ b/system/security/content/test/sri/test_csp_directive_style_imports.html
diff --git a/dom/security/test/sri/test_require-sri-for_csp_directive.html b/system/security/content/test/sri/test_require-sri-for_csp_directive.html
index ef1b3603f..ef1b3603f 100644
--- a/dom/security/test/sri/test_require-sri-for_csp_directive.html
+++ b/system/security/content/test/sri/test_require-sri-for_csp_directive.html
diff --git a/dom/security/test/sri/test_require-sri-for_csp_directive_disabled.html b/system/security/content/test/sri/test_require-sri-for_csp_directive_disabled.html
index b833fe11c..b833fe11c 100644
--- a/dom/security/test/sri/test_require-sri-for_csp_directive_disabled.html
+++ b/system/security/content/test/sri/test_require-sri-for_csp_directive_disabled.html
diff --git a/dom/security/test/sri/test_script_crossdomain.html b/system/security/content/test/sri/test_script_crossdomain.html
index 327ea4247..327ea4247 100644
--- a/dom/security/test/sri/test_script_crossdomain.html
+++ b/system/security/content/test/sri/test_script_crossdomain.html
diff --git a/dom/security/test/sri/test_script_sameorigin.html b/system/security/content/test/sri/test_script_sameorigin.html
index df890d5f9..df890d5f9 100644
--- a/dom/security/test/sri/test_script_sameorigin.html
+++ b/system/security/content/test/sri/test_script_sameorigin.html
diff --git a/dom/security/test/sri/test_sri_disabled.html b/system/security/content/test/sri/test_sri_disabled.html
index 4661235b1..4661235b1 100644
--- a/dom/security/test/sri/test_sri_disabled.html
+++ b/system/security/content/test/sri/test_sri_disabled.html
diff --git a/dom/security/test/sri/test_style_crossdomain.html b/system/security/content/test/sri/test_style_crossdomain.html
index 6bf4b2de1..6bf4b2de1 100644
--- a/dom/security/test/sri/test_style_crossdomain.html
+++ b/system/security/content/test/sri/test_style_crossdomain.html
diff --git a/dom/security/test/sri/test_style_sameorigin.html b/system/security/content/test/sri/test_style_sameorigin.html
index fb1d3f78d..fb1d3f78d 100644
--- a/dom/security/test/sri/test_style_sameorigin.html
+++ b/system/security/content/test/sri/test_style_sameorigin.html
diff --git a/dom/security/test/unit/test_csp_reports.js b/system/security/content/test/unit/test_csp_reports.js
index 6c88fb1e1..6c88fb1e1 100644
--- a/dom/security/test/unit/test_csp_reports.js
+++ b/system/security/content/test/unit/test_csp_reports.js
diff --git a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js b/system/security/content/test/unit/test_csp_upgrade_insecure_request_header.js
index 8be873234..8be873234 100644
--- a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js
+++ b/system/security/content/test/unit/test_csp_upgrade_insecure_request_header.js
diff --git a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/system/security/content/test/unit/test_isOriginPotentiallyTrustworthy.js
index 7de8faa8f..7de8faa8f 100644
--- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js
+++ b/system/security/content/test/unit/test_isOriginPotentiallyTrustworthy.js
diff --git a/dom/security/test/unit/xpcshell.ini b/system/security/content/test/unit/xpcshell.ini
index 7e1d4a0ed..7e1d4a0ed 100644
--- a/dom/security/test/unit/xpcshell.ini
+++ b/system/security/content/test/unit/xpcshell.ini
diff --git a/security/manager/.eslintrc.js b/system/security/manager/.eslintrc.js
index 6b292f366..6b292f366 100644
--- a/security/manager/.eslintrc.js
+++ b/system/security/manager/.eslintrc.js
diff --git a/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties b/system/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties
index 31274f985..31274f985 100644
--- a/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties
+++ b/system/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties
diff --git a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties b/system/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
index 23d7a323c..23d7a323c 100755..100644
--- a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
+++ b/system/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
diff --git a/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/system/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index 6ad47bf7e..6ad47bf7e 100644
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/system/security/manager/locales/en-US/chrome/pippki/certManager.dtd
diff --git a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd b/system/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
index d072fefe1..d072fefe1 100644
--- a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
+++ b/system/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.dtd b/system/security/manager/locales/en-US/chrome/pippki/pippki.dtd
index 3bc3c1f85..3bc3c1f85 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.dtd
+++ b/system/security/manager/locales/en-US/chrome/pippki/pippki.dtd
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/system/security/manager/locales/en-US/chrome/pippki/pippki.properties
index 1f926a58e..1f926a58e 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/system/security/manager/locales/en-US/chrome/pippki/pippki.properties
diff --git a/security/manager/locales/jar.mn b/system/security/manager/locales/jar.mn
index 9b5c2da44..9b5c2da44 100644
--- a/security/manager/locales/jar.mn
+++ b/system/security/manager/locales/jar.mn
diff --git a/security/manager/locales/moz.build b/system/security/manager/locales/moz.build
index 635fa39c9..635fa39c9 100644
--- a/security/manager/locales/moz.build
+++ b/system/security/manager/locales/moz.build
diff --git a/security/manager/moz.build b/system/security/manager/moz.build
index e94be25cd..e94be25cd 100644
--- a/security/manager/moz.build
+++ b/system/security/manager/moz.build
diff --git a/security/manager/pki/moz.build b/system/security/manager/pki/moz.build
index e5adab4be..e5adab4be 100644
--- a/security/manager/pki/moz.build
+++ b/system/security/manager/pki/moz.build
diff --git a/security/manager/pki/nsASN1Tree.cpp b/system/security/manager/pki/nsASN1Tree.cpp
index ce9672d8d..ce9672d8d 100644
--- a/security/manager/pki/nsASN1Tree.cpp
+++ b/system/security/manager/pki/nsASN1Tree.cpp
diff --git a/security/manager/pki/nsASN1Tree.h b/system/security/manager/pki/nsASN1Tree.h
index bb2325b7a..bb2325b7a 100644
--- a/security/manager/pki/nsASN1Tree.h
+++ b/system/security/manager/pki/nsASN1Tree.h
diff --git a/security/manager/pki/nsIASN1Tree.idl b/system/security/manager/pki/nsIASN1Tree.idl
index a0e2a265a..a0e2a265a 100644
--- a/security/manager/pki/nsIASN1Tree.idl
+++ b/system/security/manager/pki/nsIASN1Tree.idl
diff --git a/security/manager/pki/nsNSSDialogHelper.cpp b/system/security/manager/pki/nsNSSDialogHelper.cpp
index 95d02a981..95d02a981 100644
--- a/security/manager/pki/nsNSSDialogHelper.cpp
+++ b/system/security/manager/pki/nsNSSDialogHelper.cpp
diff --git a/security/manager/pki/nsNSSDialogHelper.h b/system/security/manager/pki/nsNSSDialogHelper.h
index 87605da5f..87605da5f 100644
--- a/security/manager/pki/nsNSSDialogHelper.h
+++ b/system/security/manager/pki/nsNSSDialogHelper.h
diff --git a/security/manager/pki/nsNSSDialogs.cpp b/system/security/manager/pki/nsNSSDialogs.cpp
index 831bce57e..831bce57e 100644
--- a/security/manager/pki/nsNSSDialogs.cpp
+++ b/system/security/manager/pki/nsNSSDialogs.cpp
diff --git a/security/manager/pki/nsNSSDialogs.h b/system/security/manager/pki/nsNSSDialogs.h
index 164d661ee..164d661ee 100644
--- a/security/manager/pki/nsNSSDialogs.h
+++ b/system/security/manager/pki/nsNSSDialogs.h
diff --git a/security/manager/pki/nsPKIModule.cpp b/system/security/manager/pki/nsPKIModule.cpp
index fc4c5689c..fc4c5689c 100644
--- a/security/manager/pki/nsPKIModule.cpp
+++ b/system/security/manager/pki/nsPKIModule.cpp
diff --git a/security/manager/pki/resources/content/CAOverlay.xul b/system/security/manager/pki/resources/content/CAOverlay.xul
index ba4f4abf8..ba4f4abf8 100644
--- a/security/manager/pki/resources/content/CAOverlay.xul
+++ b/system/security/manager/pki/resources/content/CAOverlay.xul
diff --git a/security/manager/pki/resources/content/MineOverlay.xul b/system/security/manager/pki/resources/content/MineOverlay.xul
index 57526ac0f..57526ac0f 100644
--- a/security/manager/pki/resources/content/MineOverlay.xul
+++ b/system/security/manager/pki/resources/content/MineOverlay.xul
diff --git a/security/manager/pki/resources/content/OrphanOverlay.xul b/system/security/manager/pki/resources/content/OrphanOverlay.xul
index a81ca9424..a81ca9424 100644
--- a/security/manager/pki/resources/content/OrphanOverlay.xul
+++ b/system/security/manager/pki/resources/content/OrphanOverlay.xul
diff --git a/security/manager/pki/resources/content/OthersOverlay.xul b/system/security/manager/pki/resources/content/OthersOverlay.xul
index 0f5154277..0f5154277 100644
--- a/security/manager/pki/resources/content/OthersOverlay.xul
+++ b/system/security/manager/pki/resources/content/OthersOverlay.xul
diff --git a/security/manager/pki/resources/content/WebSitesOverlay.xul b/system/security/manager/pki/resources/content/WebSitesOverlay.xul
index e0f3ae788..e0f3ae788 100644
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/system/security/manager/pki/resources/content/WebSitesOverlay.xul
diff --git a/security/manager/pki/resources/content/certDump.xul b/system/security/manager/pki/resources/content/certDump.xul
index 74d9b3f8b..74d9b3f8b 100644
--- a/security/manager/pki/resources/content/certDump.xul
+++ b/system/security/manager/pki/resources/content/certDump.xul
diff --git a/security/manager/pki/resources/content/certManager.js b/system/security/manager/pki/resources/content/certManager.js
index c52477442..c52477442 100644
--- a/security/manager/pki/resources/content/certManager.js
+++ b/system/security/manager/pki/resources/content/certManager.js
diff --git a/security/manager/pki/resources/content/certManager.xul b/system/security/manager/pki/resources/content/certManager.xul
index 3ea5862e4..3ea5862e4 100644
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/system/security/manager/pki/resources/content/certManager.xul
diff --git a/security/manager/pki/resources/content/certViewer.js b/system/security/manager/pki/resources/content/certViewer.js
index c62507694..c62507694 100644
--- a/security/manager/pki/resources/content/certViewer.js
+++ b/system/security/manager/pki/resources/content/certViewer.js
diff --git a/security/manager/pki/resources/content/certViewer.xul b/system/security/manager/pki/resources/content/certViewer.xul
index 3f2cd3bde..3f2cd3bde 100644
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/system/security/manager/pki/resources/content/certViewer.xul
diff --git a/security/manager/pki/resources/content/changepassword.js b/system/security/manager/pki/resources/content/changepassword.js
index 823145697..823145697 100644
--- a/security/manager/pki/resources/content/changepassword.js
+++ b/system/security/manager/pki/resources/content/changepassword.js
diff --git a/security/manager/pki/resources/content/changepassword.xul b/system/security/manager/pki/resources/content/changepassword.xul
index 7f0878ec1..7f0878ec1 100644
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/system/security/manager/pki/resources/content/changepassword.xul
diff --git a/security/manager/pki/resources/content/choosetoken.js b/system/security/manager/pki/resources/content/choosetoken.js
index 42e8565da..42e8565da 100644
--- a/security/manager/pki/resources/content/choosetoken.js
+++ b/system/security/manager/pki/resources/content/choosetoken.js
diff --git a/security/manager/pki/resources/content/choosetoken.xul b/system/security/manager/pki/resources/content/choosetoken.xul
index 55d9c108b..55d9c108b 100644
--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/system/security/manager/pki/resources/content/choosetoken.xul
diff --git a/security/manager/pki/resources/content/clientauthask.js b/system/security/manager/pki/resources/content/clientauthask.js
index 55a3c5b77..55a3c5b77 100644
--- a/security/manager/pki/resources/content/clientauthask.js
+++ b/system/security/manager/pki/resources/content/clientauthask.js
diff --git a/security/manager/pki/resources/content/clientauthask.xul b/system/security/manager/pki/resources/content/clientauthask.xul
index 2d6ba54c2..2d6ba54c2 100644
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/system/security/manager/pki/resources/content/clientauthask.xul
diff --git a/security/manager/pki/resources/content/createCertInfo.js b/system/security/manager/pki/resources/content/createCertInfo.js
index 5e7e9052c..5e7e9052c 100644
--- a/security/manager/pki/resources/content/createCertInfo.js
+++ b/system/security/manager/pki/resources/content/createCertInfo.js
diff --git a/security/manager/pki/resources/content/createCertInfo.xul b/system/security/manager/pki/resources/content/createCertInfo.xul
index 66f4ba9c6..66f4ba9c6 100644
--- a/security/manager/pki/resources/content/createCertInfo.xul
+++ b/system/security/manager/pki/resources/content/createCertInfo.xul
diff --git a/security/manager/pki/resources/content/deletecert.js b/system/security/manager/pki/resources/content/deletecert.js
index 784001ea2..784001ea2 100644
--- a/security/manager/pki/resources/content/deletecert.js
+++ b/system/security/manager/pki/resources/content/deletecert.js
diff --git a/security/manager/pki/resources/content/deletecert.xul b/system/security/manager/pki/resources/content/deletecert.xul
index 40b0c081b..40b0c081b 100644
--- a/security/manager/pki/resources/content/deletecert.xul
+++ b/system/security/manager/pki/resources/content/deletecert.xul
diff --git a/security/manager/pki/resources/content/device_manager.js b/system/security/manager/pki/resources/content/device_manager.js
index 7d16c5888..7d16c5888 100644
--- a/security/manager/pki/resources/content/device_manager.js
+++ b/system/security/manager/pki/resources/content/device_manager.js
diff --git a/security/manager/pki/resources/content/device_manager.xul b/system/security/manager/pki/resources/content/device_manager.xul
index 0a5b4ca91..0a5b4ca91 100644
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/system/security/manager/pki/resources/content/device_manager.xul
diff --git a/security/manager/pki/resources/content/downloadcert.js b/system/security/manager/pki/resources/content/downloadcert.js
index 892e34be0..892e34be0 100644
--- a/security/manager/pki/resources/content/downloadcert.js
+++ b/system/security/manager/pki/resources/content/downloadcert.js
diff --git a/security/manager/pki/resources/content/downloadcert.xul b/system/security/manager/pki/resources/content/downloadcert.xul
index 9ddc88a17..9ddc88a17 100644
--- a/security/manager/pki/resources/content/downloadcert.xul
+++ b/system/security/manager/pki/resources/content/downloadcert.xul
diff --git a/security/manager/pki/resources/content/editcacert.js b/system/security/manager/pki/resources/content/editcacert.js
index 405d5281a..405d5281a 100644
--- a/security/manager/pki/resources/content/editcacert.js
+++ b/system/security/manager/pki/resources/content/editcacert.js
diff --git a/security/manager/pki/resources/content/editcacert.xul b/system/security/manager/pki/resources/content/editcacert.xul
index 46ea4f1f9..46ea4f1f9 100644
--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/system/security/manager/pki/resources/content/editcacert.xul
diff --git a/security/manager/pki/resources/content/exceptionDialog.js b/system/security/manager/pki/resources/content/exceptionDialog.js
index 1f719bc29..1f719bc29 100644
--- a/security/manager/pki/resources/content/exceptionDialog.js
+++ b/system/security/manager/pki/resources/content/exceptionDialog.js
diff --git a/security/manager/pki/resources/content/exceptionDialog.xul b/system/security/manager/pki/resources/content/exceptionDialog.xul
index 6d417f360..6d417f360 100644
--- a/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/system/security/manager/pki/resources/content/exceptionDialog.xul
diff --git a/security/manager/pki/resources/content/load_device.xul b/system/security/manager/pki/resources/content/load_device.xul
index 45fffcee7..45fffcee7 100644
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/system/security/manager/pki/resources/content/load_device.xul
diff --git a/security/manager/pki/resources/content/pippki.js b/system/security/manager/pki/resources/content/pippki.js
index b660d2d93..b660d2d93 100644
--- a/security/manager/pki/resources/content/pippki.js
+++ b/system/security/manager/pki/resources/content/pippki.js
diff --git a/security/manager/pki/resources/content/protectedAuth.js b/system/security/manager/pki/resources/content/protectedAuth.js
index 3ffd96a83..3ffd96a83 100644
--- a/security/manager/pki/resources/content/protectedAuth.js
+++ b/system/security/manager/pki/resources/content/protectedAuth.js
diff --git a/security/manager/pki/resources/content/protectedAuth.xul b/system/security/manager/pki/resources/content/protectedAuth.xul
index 46aba7cce..46aba7cce 100644
--- a/security/manager/pki/resources/content/protectedAuth.xul
+++ b/system/security/manager/pki/resources/content/protectedAuth.xul
diff --git a/security/manager/pki/resources/content/resetpassword.js b/system/security/manager/pki/resources/content/resetpassword.js
index 35dc5b2e5..35dc5b2e5 100644
--- a/security/manager/pki/resources/content/resetpassword.js
+++ b/system/security/manager/pki/resources/content/resetpassword.js
diff --git a/security/manager/pki/resources/content/resetpassword.xul b/system/security/manager/pki/resources/content/resetpassword.xul
index 6da79b0d9..6da79b0d9 100644
--- a/security/manager/pki/resources/content/resetpassword.xul
+++ b/system/security/manager/pki/resources/content/resetpassword.xul
diff --git a/security/manager/pki/resources/content/setp12password.js b/system/security/manager/pki/resources/content/setp12password.js
index 5a4836735..5a4836735 100644
--- a/security/manager/pki/resources/content/setp12password.js
+++ b/system/security/manager/pki/resources/content/setp12password.js
diff --git a/security/manager/pki/resources/content/setp12password.xul b/system/security/manager/pki/resources/content/setp12password.xul
index 2bdcd5fe9..2bdcd5fe9 100644
--- a/security/manager/pki/resources/content/setp12password.xul
+++ b/system/security/manager/pki/resources/content/setp12password.xul
diff --git a/security/manager/pki/resources/content/viewCertDetails.xul b/system/security/manager/pki/resources/content/viewCertDetails.xul
index 86acb751c..86acb751c 100644
--- a/security/manager/pki/resources/content/viewCertDetails.xul
+++ b/system/security/manager/pki/resources/content/viewCertDetails.xul
diff --git a/security/manager/pki/resources/jar.mn b/system/security/manager/pki/resources/jar.mn
index 36018524f..36018524f 100644
--- a/security/manager/pki/resources/jar.mn
+++ b/system/security/manager/pki/resources/jar.mn
diff --git a/security/manager/pki/resources/moz.build b/system/security/manager/pki/resources/moz.build
index 635fa39c9..635fa39c9 100644
--- a/security/manager/pki/resources/moz.build
+++ b/system/security/manager/pki/resources/moz.build
diff --git a/security/manager/ssl/CSTrustDomain.cpp b/system/security/manager/ssl/CSTrustDomain.cpp
index 0dd357e75..0dd357e75 100644
--- a/security/manager/ssl/CSTrustDomain.cpp
+++ b/system/security/manager/ssl/CSTrustDomain.cpp
diff --git a/security/manager/ssl/CSTrustDomain.h b/system/security/manager/ssl/CSTrustDomain.h
index 02448b7df..02448b7df 100644
--- a/security/manager/ssl/CSTrustDomain.h
+++ b/system/security/manager/ssl/CSTrustDomain.h
diff --git a/security/manager/ssl/CertBlocklist.cpp b/system/security/manager/ssl/CertBlocklist.cpp
index 8701032ed..8701032ed 100644
--- a/security/manager/ssl/CertBlocklist.cpp
+++ b/system/security/manager/ssl/CertBlocklist.cpp
diff --git a/security/manager/ssl/CertBlocklist.h b/system/security/manager/ssl/CertBlocklist.h
index 2cad45eef..2cad45eef 100644
--- a/security/manager/ssl/CertBlocklist.h
+++ b/system/security/manager/ssl/CertBlocklist.h
diff --git a/security/manager/ssl/ContentSignatureVerifier.cpp b/system/security/manager/ssl/ContentSignatureVerifier.cpp
index f35dc1da9..f35dc1da9 100644
--- a/security/manager/ssl/ContentSignatureVerifier.cpp
+++ b/system/security/manager/ssl/ContentSignatureVerifier.cpp
diff --git a/security/manager/ssl/ContentSignatureVerifier.h b/system/security/manager/ssl/ContentSignatureVerifier.h
index 9e471296d..9e471296d 100644
--- a/security/manager/ssl/ContentSignatureVerifier.h
+++ b/system/security/manager/ssl/ContentSignatureVerifier.h
diff --git a/security/manager/ssl/CryptoTask.cpp b/system/security/manager/ssl/CryptoTask.cpp
index 5db770a63..5db770a63 100644
--- a/security/manager/ssl/CryptoTask.cpp
+++ b/system/security/manager/ssl/CryptoTask.cpp
diff --git a/security/manager/ssl/CryptoTask.h b/system/security/manager/ssl/CryptoTask.h
index ed40b4f27..ed40b4f27 100644
--- a/security/manager/ssl/CryptoTask.h
+++ b/system/security/manager/ssl/CryptoTask.h
diff --git a/security/manager/ssl/DER.jsm b/system/security/manager/ssl/DER.jsm
index 97669515a..97669515a 100644
--- a/security/manager/ssl/DER.jsm
+++ b/system/security/manager/ssl/DER.jsm
diff --git a/security/manager/ssl/DataStorage.cpp b/system/security/manager/ssl/DataStorage.cpp
index 8fd7424e5..8fd7424e5 100644
--- a/security/manager/ssl/DataStorage.cpp
+++ b/system/security/manager/ssl/DataStorage.cpp
diff --git a/security/manager/ssl/DataStorage.h b/system/security/manager/ssl/DataStorage.h
index 13e368825..13e368825 100644
--- a/security/manager/ssl/DataStorage.h
+++ b/system/security/manager/ssl/DataStorage.h
diff --git a/security/manager/ssl/DataStorageIPCUtils.h b/system/security/manager/ssl/DataStorageIPCUtils.h
index 282af4dca..282af4dca 100644
--- a/security/manager/ssl/DataStorageIPCUtils.h
+++ b/system/security/manager/ssl/DataStorageIPCUtils.h
diff --git a/security/manager/ssl/LocalCertService.cpp b/system/security/manager/ssl/LocalCertService.cpp
index 7ea0b4789..7ea0b4789 100644
--- a/security/manager/ssl/LocalCertService.cpp
+++ b/system/security/manager/ssl/LocalCertService.cpp
diff --git a/security/manager/ssl/LocalCertService.h b/system/security/manager/ssl/LocalCertService.h
index fb5a999cd..fb5a999cd 100644
--- a/security/manager/ssl/LocalCertService.h
+++ b/system/security/manager/ssl/LocalCertService.h
diff --git a/security/manager/ssl/NSSErrorsService.cpp b/system/security/manager/ssl/NSSErrorsService.cpp
index 0632203b1..0632203b1 100644
--- a/security/manager/ssl/NSSErrorsService.cpp
+++ b/system/security/manager/ssl/NSSErrorsService.cpp
diff --git a/security/manager/ssl/NSSErrorsService.h b/system/security/manager/ssl/NSSErrorsService.h
index 844ceda35..844ceda35 100644
--- a/security/manager/ssl/NSSErrorsService.h
+++ b/system/security/manager/ssl/NSSErrorsService.h
diff --git a/security/manager/ssl/PPSMContentDownloader.ipdl b/system/security/manager/ssl/PPSMContentDownloader.ipdl
index 7c4991520..7c4991520 100644
--- a/security/manager/ssl/PPSMContentDownloader.ipdl
+++ b/system/security/manager/ssl/PPSMContentDownloader.ipdl
diff --git a/security/manager/ssl/PSMContentListener.cpp b/system/security/manager/ssl/PSMContentListener.cpp
index 2327f3462..2327f3462 100644
--- a/security/manager/ssl/PSMContentListener.cpp
+++ b/system/security/manager/ssl/PSMContentListener.cpp
diff --git a/security/manager/ssl/PSMContentListener.h b/system/security/manager/ssl/PSMContentListener.h
index d948383a4..d948383a4 100644
--- a/security/manager/ssl/PSMContentListener.h
+++ b/system/security/manager/ssl/PSMContentListener.h
diff --git a/security/manager/ssl/PSMRunnable.cpp b/system/security/manager/ssl/PSMRunnable.cpp
index 9f151a83f..9f151a83f 100644
--- a/security/manager/ssl/PSMRunnable.cpp
+++ b/system/security/manager/ssl/PSMRunnable.cpp
diff --git a/security/manager/ssl/PSMRunnable.h b/system/security/manager/ssl/PSMRunnable.h
index b43bc62c6..b43bc62c6 100644
--- a/security/manager/ssl/PSMRunnable.h
+++ b/system/security/manager/ssl/PSMRunnable.h
diff --git a/security/manager/ssl/PublicSSL.h b/system/security/manager/ssl/PublicSSL.h
index 4bc39f90a..4bc39f90a 100644
--- a/security/manager/ssl/PublicSSL.h
+++ b/system/security/manager/ssl/PublicSSL.h
diff --git a/security/manager/ssl/RootHashes.inc b/system/security/manager/ssl/RootHashes.inc
index c335990cb..c335990cb 100644
--- a/security/manager/ssl/RootHashes.inc
+++ b/system/security/manager/ssl/RootHashes.inc
diff --git a/security/manager/ssl/SSLServerCertVerification.cpp b/system/security/manager/ssl/SSLServerCertVerification.cpp
index 37a3b809f..37a3b809f 100644
--- a/security/manager/ssl/SSLServerCertVerification.cpp
+++ b/system/security/manager/ssl/SSLServerCertVerification.cpp
diff --git a/security/manager/ssl/SSLServerCertVerification.h b/system/security/manager/ssl/SSLServerCertVerification.h
index e729457c8..e729457c8 100644
--- a/security/manager/ssl/SSLServerCertVerification.h
+++ b/system/security/manager/ssl/SSLServerCertVerification.h
diff --git a/security/manager/ssl/ScopedNSSTypes.h b/system/security/manager/ssl/ScopedNSSTypes.h
index b85f79ed3..b85f79ed3 100644
--- a/security/manager/ssl/ScopedNSSTypes.h
+++ b/system/security/manager/ssl/ScopedNSSTypes.h
diff --git a/security/manager/ssl/SecretDecoderRing.cpp b/system/security/manager/ssl/SecretDecoderRing.cpp
index 730251ebb..730251ebb 100644
--- a/security/manager/ssl/SecretDecoderRing.cpp
+++ b/system/security/manager/ssl/SecretDecoderRing.cpp
diff --git a/security/manager/ssl/SecretDecoderRing.h b/system/security/manager/ssl/SecretDecoderRing.h
index 3bdcbe5c9..3bdcbe5c9 100644
--- a/security/manager/ssl/SecretDecoderRing.h
+++ b/system/security/manager/ssl/SecretDecoderRing.h
diff --git a/security/manager/ssl/SharedCertVerifier.h b/system/security/manager/ssl/SharedCertVerifier.h
index 135c8ae51..135c8ae51 100644
--- a/security/manager/ssl/SharedCertVerifier.h
+++ b/system/security/manager/ssl/SharedCertVerifier.h
diff --git a/security/manager/ssl/SharedSSLState.cpp b/system/security/manager/ssl/SharedSSLState.cpp
index ed6f8a962..ed6f8a962 100644
--- a/security/manager/ssl/SharedSSLState.cpp
+++ b/system/security/manager/ssl/SharedSSLState.cpp
diff --git a/security/manager/ssl/SharedSSLState.h b/system/security/manager/ssl/SharedSSLState.h
index 931ce06b8..931ce06b8 100644
--- a/security/manager/ssl/SharedSSLState.h
+++ b/system/security/manager/ssl/SharedSSLState.h
diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/system/security/manager/ssl/TransportSecurityInfo.cpp
index 6badceb88..6badceb88 100644
--- a/security/manager/ssl/TransportSecurityInfo.cpp
+++ b/system/security/manager/ssl/TransportSecurityInfo.cpp
diff --git a/security/manager/ssl/TransportSecurityInfo.h b/system/security/manager/ssl/TransportSecurityInfo.h
index 7f8847852..7f8847852 100644
--- a/security/manager/ssl/TransportSecurityInfo.h
+++ b/system/security/manager/ssl/TransportSecurityInfo.h
diff --git a/security/manager/ssl/WeakCryptoOverride.cpp b/system/security/manager/ssl/WeakCryptoOverride.cpp
index a048b2af1..a048b2af1 100644
--- a/security/manager/ssl/WeakCryptoOverride.cpp
+++ b/system/security/manager/ssl/WeakCryptoOverride.cpp
diff --git a/security/manager/ssl/WeakCryptoOverride.h b/system/security/manager/ssl/WeakCryptoOverride.h
index fefee75ef..fefee75ef 100644
--- a/security/manager/ssl/WeakCryptoOverride.h
+++ b/system/security/manager/ssl/WeakCryptoOverride.h
diff --git a/security/manager/ssl/X509.jsm b/system/security/manager/ssl/X509.jsm
index be107454e..be107454e 100644
--- a/security/manager/ssl/X509.jsm
+++ b/system/security/manager/ssl/X509.jsm
diff --git a/security/manager/ssl/crashtests/398665-1.html b/system/security/manager/ssl/crashtests/398665-1.html
index 85afb1137..85afb1137 100644
--- a/security/manager/ssl/crashtests/398665-1.html
+++ b/system/security/manager/ssl/crashtests/398665-1.html
diff --git a/security/manager/ssl/crashtests/crashtests.list b/system/security/manager/ssl/crashtests/crashtests.list
index fbc5b8504..fbc5b8504 100644
--- a/security/manager/ssl/crashtests/crashtests.list
+++ b/system/security/manager/ssl/crashtests/crashtests.list
diff --git a/security/manager/ssl/md4.c b/system/security/manager/ssl/md4.c
index 696865de3..696865de3 100644
--- a/security/manager/ssl/md4.c
+++ b/system/security/manager/ssl/md4.c
diff --git a/security/manager/ssl/md4.h b/system/security/manager/ssl/md4.h
index 4107aed40..4107aed40 100644
--- a/security/manager/ssl/md4.h
+++ b/system/security/manager/ssl/md4.h
diff --git a/security/manager/ssl/moz.build b/system/security/manager/ssl/moz.build
index a8011f3c8..609388cc1 100644
--- a/security/manager/ssl/moz.build
+++ b/system/security/manager/ssl/moz.build
@@ -158,10 +158,10 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '../../certverifier',
+    '../../pkix/include',
     '/dom/base',
     '/dom/crypto',
-    '/security/certverifier',
-    '/security/pkix/include',
 ]
 
 LOCAL_INCLUDES += [
diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/system/security/manager/ssl/nsCertOverrideService.cpp
index 438709856..438709856 100644
--- a/security/manager/ssl/nsCertOverrideService.cpp
+++ b/system/security/manager/ssl/nsCertOverrideService.cpp
diff --git a/security/manager/ssl/nsCertOverrideService.h b/system/security/manager/ssl/nsCertOverrideService.h
index 5793d1e6c..5793d1e6c 100644
--- a/security/manager/ssl/nsCertOverrideService.h
+++ b/system/security/manager/ssl/nsCertOverrideService.h
diff --git a/security/manager/ssl/nsCertTree.cpp b/system/security/manager/ssl/nsCertTree.cpp
index 1ad4e296b..1ad4e296b 100644
--- a/security/manager/ssl/nsCertTree.cpp
+++ b/system/security/manager/ssl/nsCertTree.cpp
diff --git a/security/manager/ssl/nsCertTree.h b/system/security/manager/ssl/nsCertTree.h
index bf17b4efa..bf17b4efa 100644
--- a/security/manager/ssl/nsCertTree.h
+++ b/system/security/manager/ssl/nsCertTree.h
diff --git a/security/manager/ssl/nsClientAuthRemember.cpp b/system/security/manager/ssl/nsClientAuthRemember.cpp
index 059955901..059955901 100644
--- a/security/manager/ssl/nsClientAuthRemember.cpp
+++ b/system/security/manager/ssl/nsClientAuthRemember.cpp
diff --git a/security/manager/ssl/nsClientAuthRemember.h b/system/security/manager/ssl/nsClientAuthRemember.h
index 1be5601ce..1be5601ce 100644
--- a/security/manager/ssl/nsClientAuthRemember.h
+++ b/system/security/manager/ssl/nsClientAuthRemember.h
diff --git a/security/manager/ssl/nsCrypto.cpp b/system/security/manager/ssl/nsCrypto.cpp
index c20553527..c20553527 100644
--- a/security/manager/ssl/nsCrypto.cpp
+++ b/system/security/manager/ssl/nsCrypto.cpp
diff --git a/security/manager/ssl/nsCrypto.h b/system/security/manager/ssl/nsCrypto.h
index ec231b471..ec231b471 100644
--- a/security/manager/ssl/nsCrypto.h
+++ b/system/security/manager/ssl/nsCrypto.h
diff --git a/security/manager/ssl/nsCryptoHash.cpp b/system/security/manager/ssl/nsCryptoHash.cpp
index d57eb5f58..d57eb5f58 100644
--- a/security/manager/ssl/nsCryptoHash.cpp
+++ b/system/security/manager/ssl/nsCryptoHash.cpp
diff --git a/security/manager/ssl/nsCryptoHash.h b/system/security/manager/ssl/nsCryptoHash.h
index 194f274d6..194f274d6 100644
--- a/security/manager/ssl/nsCryptoHash.h
+++ b/system/security/manager/ssl/nsCryptoHash.h
diff --git a/security/manager/ssl/nsDataSignatureVerifier.cpp b/system/security/manager/ssl/nsDataSignatureVerifier.cpp
index e67ff2406..e67ff2406 100644
--- a/security/manager/ssl/nsDataSignatureVerifier.cpp
+++ b/system/security/manager/ssl/nsDataSignatureVerifier.cpp
diff --git a/security/manager/ssl/nsDataSignatureVerifier.h b/system/security/manager/ssl/nsDataSignatureVerifier.h
index 485af70c8..485af70c8 100644
--- a/security/manager/ssl/nsDataSignatureVerifier.h
+++ b/system/security/manager/ssl/nsDataSignatureVerifier.h
diff --git a/security/manager/ssl/nsIASN1Object.idl b/system/security/manager/ssl/nsIASN1Object.idl
index 3996286b7..3996286b7 100644
--- a/security/manager/ssl/nsIASN1Object.idl
+++ b/system/security/manager/ssl/nsIASN1Object.idl
diff --git a/security/manager/ssl/nsIASN1PrintableItem.idl b/system/security/manager/ssl/nsIASN1PrintableItem.idl
index 84e6879c4..84e6879c4 100644
--- a/security/manager/ssl/nsIASN1PrintableItem.idl
+++ b/system/security/manager/ssl/nsIASN1PrintableItem.idl
diff --git a/security/manager/ssl/nsIASN1Sequence.idl b/system/security/manager/ssl/nsIASN1Sequence.idl
index c865f2bfc..c865f2bfc 100644
--- a/security/manager/ssl/nsIASN1Sequence.idl
+++ b/system/security/manager/ssl/nsIASN1Sequence.idl
diff --git a/security/manager/ssl/nsIAssociatedContentSecurity.idl b/system/security/manager/ssl/nsIAssociatedContentSecurity.idl
index 666f141f9..666f141f9 100644
--- a/security/manager/ssl/nsIAssociatedContentSecurity.idl
+++ b/system/security/manager/ssl/nsIAssociatedContentSecurity.idl
diff --git a/security/manager/ssl/nsIBadCertListener2.idl b/system/security/manager/ssl/nsIBadCertListener2.idl
index 9cd1cd382..9cd1cd382 100644
--- a/security/manager/ssl/nsIBadCertListener2.idl
+++ b/system/security/manager/ssl/nsIBadCertListener2.idl
diff --git a/security/manager/ssl/nsICertBlocklist.idl b/system/security/manager/ssl/nsICertBlocklist.idl
index 5cf1c0952..5cf1c0952 100644
--- a/security/manager/ssl/nsICertBlocklist.idl
+++ b/system/security/manager/ssl/nsICertBlocklist.idl
diff --git a/security/manager/ssl/nsICertOverrideService.idl b/system/security/manager/ssl/nsICertOverrideService.idl
index b220851e2..b220851e2 100644
--- a/security/manager/ssl/nsICertOverrideService.idl
+++ b/system/security/manager/ssl/nsICertOverrideService.idl
diff --git a/security/manager/ssl/nsICertTree.idl b/system/security/manager/ssl/nsICertTree.idl
index 2ef4e1947..2ef4e1947 100644
--- a/security/manager/ssl/nsICertTree.idl
+++ b/system/security/manager/ssl/nsICertTree.idl
diff --git a/security/manager/ssl/nsICertificateDialogs.idl b/system/security/manager/ssl/nsICertificateDialogs.idl
index a5f023ffd..a5f023ffd 100644
--- a/security/manager/ssl/nsICertificateDialogs.idl
+++ b/system/security/manager/ssl/nsICertificateDialogs.idl
diff --git a/security/manager/ssl/nsIClientAuthDialogs.idl b/system/security/manager/ssl/nsIClientAuthDialogs.idl
index 8fcc7094e..8fcc7094e 100644
--- a/security/manager/ssl/nsIClientAuthDialogs.idl
+++ b/system/security/manager/ssl/nsIClientAuthDialogs.idl
diff --git a/security/manager/ssl/nsIContentSignatureVerifier.idl b/system/security/manager/ssl/nsIContentSignatureVerifier.idl
index 59a9d83ee..59a9d83ee 100644
--- a/security/manager/ssl/nsIContentSignatureVerifier.idl
+++ b/system/security/manager/ssl/nsIContentSignatureVerifier.idl
diff --git a/security/manager/ssl/nsIDataSignatureVerifier.idl b/system/security/manager/ssl/nsIDataSignatureVerifier.idl
index 347eaedc9..347eaedc9 100644
--- a/security/manager/ssl/nsIDataSignatureVerifier.idl
+++ b/system/security/manager/ssl/nsIDataSignatureVerifier.idl
diff --git a/security/manager/ssl/nsIGenKeypairInfoDlg.idl b/system/security/manager/ssl/nsIGenKeypairInfoDlg.idl
index 03f2c4658..03f2c4658 100644
--- a/security/manager/ssl/nsIGenKeypairInfoDlg.idl
+++ b/system/security/manager/ssl/nsIGenKeypairInfoDlg.idl
diff --git a/security/manager/ssl/nsIKeyModule.idl b/system/security/manager/ssl/nsIKeyModule.idl
index d9e1d1138..d9e1d1138 100644
--- a/security/manager/ssl/nsIKeyModule.idl
+++ b/system/security/manager/ssl/nsIKeyModule.idl
diff --git a/security/manager/ssl/nsIKeygenThread.idl b/system/security/manager/ssl/nsIKeygenThread.idl
index 85d619b97..85d619b97 100644
--- a/security/manager/ssl/nsIKeygenThread.idl
+++ b/system/security/manager/ssl/nsIKeygenThread.idl
diff --git a/security/manager/ssl/nsILocalCertService.idl b/system/security/manager/ssl/nsILocalCertService.idl
index a452683d9..a452683d9 100644
--- a/security/manager/ssl/nsILocalCertService.idl
+++ b/system/security/manager/ssl/nsILocalCertService.idl
diff --git a/security/manager/ssl/nsINSSU2FToken.idl b/system/security/manager/ssl/nsINSSU2FToken.idl
index 649ed682a..649ed682a 100644
--- a/security/manager/ssl/nsINSSU2FToken.idl
+++ b/system/security/manager/ssl/nsINSSU2FToken.idl
diff --git a/security/manager/ssl/nsINSSVersion.idl b/system/security/manager/ssl/nsINSSVersion.idl
index 0ad474b35..0ad474b35 100644
--- a/security/manager/ssl/nsINSSVersion.idl
+++ b/system/security/manager/ssl/nsINSSVersion.idl
diff --git a/security/manager/ssl/nsIPK11Token.idl b/system/security/manager/ssl/nsIPK11Token.idl
index 1d53ce19a..1d53ce19a 100644
--- a/security/manager/ssl/nsIPK11Token.idl
+++ b/system/security/manager/ssl/nsIPK11Token.idl
diff --git a/security/manager/ssl/nsIPK11TokenDB.idl b/system/security/manager/ssl/nsIPK11TokenDB.idl
index 297f3da11..297f3da11 100644
--- a/security/manager/ssl/nsIPK11TokenDB.idl
+++ b/system/security/manager/ssl/nsIPK11TokenDB.idl
diff --git a/security/manager/ssl/nsIPKCS11.idl b/system/security/manager/ssl/nsIPKCS11.idl
index c1e636b47..c1e636b47 100644
--- a/security/manager/ssl/nsIPKCS11.idl
+++ b/system/security/manager/ssl/nsIPKCS11.idl
diff --git a/security/manager/ssl/nsIPKCS11Module.idl b/system/security/manager/ssl/nsIPKCS11Module.idl
index 8a1591878..8a1591878 100644
--- a/security/manager/ssl/nsIPKCS11Module.idl
+++ b/system/security/manager/ssl/nsIPKCS11Module.idl
diff --git a/security/manager/ssl/nsIPKCS11ModuleDB.idl b/system/security/manager/ssl/nsIPKCS11ModuleDB.idl
index 6c0749de5..6c0749de5 100644
--- a/security/manager/ssl/nsIPKCS11ModuleDB.idl
+++ b/system/security/manager/ssl/nsIPKCS11ModuleDB.idl
diff --git a/security/manager/ssl/nsIPKCS11Slot.idl b/system/security/manager/ssl/nsIPKCS11Slot.idl
index 7c41e4fcc..7c41e4fcc 100644
--- a/security/manager/ssl/nsIPKCS11Slot.idl
+++ b/system/security/manager/ssl/nsIPKCS11Slot.idl
diff --git a/security/manager/ssl/nsIProtectedAuthThread.idl b/system/security/manager/ssl/nsIProtectedAuthThread.idl
index 3dc650fe9..3dc650fe9 100644
--- a/security/manager/ssl/nsIProtectedAuthThread.idl
+++ b/system/security/manager/ssl/nsIProtectedAuthThread.idl
diff --git a/security/manager/ssl/nsISSLStatus.idl b/system/security/manager/ssl/nsISSLStatus.idl
index d8b5c2164..d8b5c2164 100644
--- a/security/manager/ssl/nsISSLStatus.idl
+++ b/system/security/manager/ssl/nsISSLStatus.idl
diff --git a/security/manager/ssl/nsISSLStatusProvider.idl b/system/security/manager/ssl/nsISSLStatusProvider.idl
index 83048f179..83048f179 100644
--- a/security/manager/ssl/nsISSLStatusProvider.idl
+++ b/system/security/manager/ssl/nsISSLStatusProvider.idl
diff --git a/security/manager/ssl/nsISecretDecoderRing.idl b/system/security/manager/ssl/nsISecretDecoderRing.idl
index e9f67cbee..e9f67cbee 100644
--- a/security/manager/ssl/nsISecretDecoderRing.idl
+++ b/system/security/manager/ssl/nsISecretDecoderRing.idl
diff --git a/security/manager/ssl/nsISiteSecurityService.idl b/system/security/manager/ssl/nsISiteSecurityService.idl
index d0e5f61ed..d0e5f61ed 100644
--- a/security/manager/ssl/nsISiteSecurityService.idl
+++ b/system/security/manager/ssl/nsISiteSecurityService.idl
diff --git a/security/manager/ssl/nsITokenDialogs.idl b/system/security/manager/ssl/nsITokenDialogs.idl
index ceb625294..ceb625294 100644
--- a/security/manager/ssl/nsITokenDialogs.idl
+++ b/system/security/manager/ssl/nsITokenDialogs.idl
diff --git a/security/manager/ssl/nsITokenPasswordDialogs.idl b/system/security/manager/ssl/nsITokenPasswordDialogs.idl
index 6e5660b17..6e5660b17 100644
--- a/security/manager/ssl/nsITokenPasswordDialogs.idl
+++ b/system/security/manager/ssl/nsITokenPasswordDialogs.idl
diff --git a/security/manager/ssl/nsIU2FToken.idl b/system/security/manager/ssl/nsIU2FToken.idl
index 119c18593..119c18593 100644
--- a/security/manager/ssl/nsIU2FToken.idl
+++ b/system/security/manager/ssl/nsIU2FToken.idl
diff --git a/security/manager/ssl/nsIWeakCryptoOverride.idl b/system/security/manager/ssl/nsIWeakCryptoOverride.idl
index 7e3aa663f..7e3aa663f 100644
--- a/security/manager/ssl/nsIWeakCryptoOverride.idl
+++ b/system/security/manager/ssl/nsIWeakCryptoOverride.idl
diff --git a/security/manager/ssl/nsIX509Cert.idl b/system/security/manager/ssl/nsIX509Cert.idl
index b1965edd4..b1965edd4 100644
--- a/security/manager/ssl/nsIX509Cert.idl
+++ b/system/security/manager/ssl/nsIX509Cert.idl
diff --git a/security/manager/ssl/nsIX509CertDB.idl b/system/security/manager/ssl/nsIX509CertDB.idl
index 44d8e0588..44d8e0588 100644
--- a/security/manager/ssl/nsIX509CertDB.idl
+++ b/system/security/manager/ssl/nsIX509CertDB.idl
diff --git a/security/manager/ssl/nsIX509CertList.idl b/system/security/manager/ssl/nsIX509CertList.idl
index 63f1c5e38..63f1c5e38 100644
--- a/security/manager/ssl/nsIX509CertList.idl
+++ b/system/security/manager/ssl/nsIX509CertList.idl
diff --git a/security/manager/ssl/nsIX509CertValidity.idl b/system/security/manager/ssl/nsIX509CertValidity.idl
index 25d4c004b..25d4c004b 100644
--- a/security/manager/ssl/nsIX509CertValidity.idl
+++ b/system/security/manager/ssl/nsIX509CertValidity.idl
diff --git a/security/manager/ssl/nsKeyModule.cpp b/system/security/manager/ssl/nsKeyModule.cpp
index 41e5f5df9..41e5f5df9 100644
--- a/security/manager/ssl/nsKeyModule.cpp
+++ b/system/security/manager/ssl/nsKeyModule.cpp
diff --git a/security/manager/ssl/nsKeyModule.h b/system/security/manager/ssl/nsKeyModule.h
index 2f7c21937..2f7c21937 100644
--- a/security/manager/ssl/nsKeyModule.h
+++ b/system/security/manager/ssl/nsKeyModule.h
diff --git a/security/manager/ssl/nsKeygenHandler.cpp b/system/security/manager/ssl/nsKeygenHandler.cpp
index 8d8a98e73..8d8a98e73 100644
--- a/security/manager/ssl/nsKeygenHandler.cpp
+++ b/system/security/manager/ssl/nsKeygenHandler.cpp
diff --git a/security/manager/ssl/nsKeygenHandler.h b/system/security/manager/ssl/nsKeygenHandler.h
index 56cac4850..56cac4850 100644
--- a/security/manager/ssl/nsKeygenHandler.h
+++ b/system/security/manager/ssl/nsKeygenHandler.h
diff --git a/security/manager/ssl/nsKeygenHandlerContent.cpp b/system/security/manager/ssl/nsKeygenHandlerContent.cpp
index 4d8935a18..4d8935a18 100644
--- a/security/manager/ssl/nsKeygenHandlerContent.cpp
+++ b/system/security/manager/ssl/nsKeygenHandlerContent.cpp
diff --git a/security/manager/ssl/nsKeygenHandlerContent.h b/system/security/manager/ssl/nsKeygenHandlerContent.h
index 18962700e..18962700e 100644
--- a/security/manager/ssl/nsKeygenHandlerContent.h
+++ b/system/security/manager/ssl/nsKeygenHandlerContent.h
diff --git a/security/manager/ssl/nsKeygenThread.cpp b/system/security/manager/ssl/nsKeygenThread.cpp
index b295c4f36..b295c4f36 100644
--- a/security/manager/ssl/nsKeygenThread.cpp
+++ b/system/security/manager/ssl/nsKeygenThread.cpp
diff --git a/security/manager/ssl/nsKeygenThread.h b/system/security/manager/ssl/nsKeygenThread.h
index 139bf89f8..139bf89f8 100644
--- a/security/manager/ssl/nsKeygenThread.h
+++ b/system/security/manager/ssl/nsKeygenThread.h
diff --git a/security/manager/ssl/nsNSSASN1Object.cpp b/system/security/manager/ssl/nsNSSASN1Object.cpp
index 6b52d8c94..6b52d8c94 100644
--- a/security/manager/ssl/nsNSSASN1Object.cpp
+++ b/system/security/manager/ssl/nsNSSASN1Object.cpp
diff --git a/security/manager/ssl/nsNSSASN1Object.h b/system/security/manager/ssl/nsNSSASN1Object.h
index b995a58fc..b995a58fc 100644
--- a/security/manager/ssl/nsNSSASN1Object.h
+++ b/system/security/manager/ssl/nsNSSASN1Object.h
diff --git a/security/manager/ssl/nsNSSCallbacks.cpp b/system/security/manager/ssl/nsNSSCallbacks.cpp
index 4696d7c86..4696d7c86 100644
--- a/security/manager/ssl/nsNSSCallbacks.cpp
+++ b/system/security/manager/ssl/nsNSSCallbacks.cpp
diff --git a/security/manager/ssl/nsNSSCallbacks.h b/system/security/manager/ssl/nsNSSCallbacks.h
index e9d7f3172..e9d7f3172 100644
--- a/security/manager/ssl/nsNSSCallbacks.h
+++ b/system/security/manager/ssl/nsNSSCallbacks.h
diff --git a/security/manager/ssl/nsNSSCertHelper.cpp b/system/security/manager/ssl/nsNSSCertHelper.cpp
index efcb8747a..efcb8747a 100644
--- a/security/manager/ssl/nsNSSCertHelper.cpp
+++ b/system/security/manager/ssl/nsNSSCertHelper.cpp
diff --git a/security/manager/ssl/nsNSSCertHelper.h b/system/security/manager/ssl/nsNSSCertHelper.h
index d84e1b39f..d84e1b39f 100644
--- a/security/manager/ssl/nsNSSCertHelper.h
+++ b/system/security/manager/ssl/nsNSSCertHelper.h
diff --git a/security/manager/ssl/nsNSSCertTrust.cpp b/system/security/manager/ssl/nsNSSCertTrust.cpp
index b608aebe1..b608aebe1 100644
--- a/security/manager/ssl/nsNSSCertTrust.cpp
+++ b/system/security/manager/ssl/nsNSSCertTrust.cpp
diff --git a/security/manager/ssl/nsNSSCertTrust.h b/system/security/manager/ssl/nsNSSCertTrust.h
index c3f7e5441..c3f7e5441 100644
--- a/security/manager/ssl/nsNSSCertTrust.h
+++ b/system/security/manager/ssl/nsNSSCertTrust.h
diff --git a/security/manager/ssl/nsNSSCertValidity.cpp b/system/security/manager/ssl/nsNSSCertValidity.cpp
index 536aafc8f..536aafc8f 100644
--- a/security/manager/ssl/nsNSSCertValidity.cpp
+++ b/system/security/manager/ssl/nsNSSCertValidity.cpp
diff --git a/security/manager/ssl/nsNSSCertValidity.h b/system/security/manager/ssl/nsNSSCertValidity.h
index 79c95e383..79c95e383 100644
--- a/security/manager/ssl/nsNSSCertValidity.h
+++ b/system/security/manager/ssl/nsNSSCertValidity.h
diff --git a/security/manager/ssl/nsNSSCertificate.cpp b/system/security/manager/ssl/nsNSSCertificate.cpp
index f6685e89a..f6685e89a 100644
--- a/security/manager/ssl/nsNSSCertificate.cpp
+++ b/system/security/manager/ssl/nsNSSCertificate.cpp
diff --git a/security/manager/ssl/nsNSSCertificate.h b/system/security/manager/ssl/nsNSSCertificate.h
index b62c6c7ac..b62c6c7ac 100644
--- a/security/manager/ssl/nsNSSCertificate.h
+++ b/system/security/manager/ssl/nsNSSCertificate.h
diff --git a/security/manager/ssl/nsNSSCertificateDB.cpp b/system/security/manager/ssl/nsNSSCertificateDB.cpp
index 3d7c7eec4..3d7c7eec4 100644
--- a/security/manager/ssl/nsNSSCertificateDB.cpp
+++ b/system/security/manager/ssl/nsNSSCertificateDB.cpp
diff --git a/security/manager/ssl/nsNSSCertificateDB.h b/system/security/manager/ssl/nsNSSCertificateDB.h
index 06af6739a..06af6739a 100644
--- a/security/manager/ssl/nsNSSCertificateDB.h
+++ b/system/security/manager/ssl/nsNSSCertificateDB.h
diff --git a/security/manager/ssl/nsNSSCertificateFakeTransport.cpp b/system/security/manager/ssl/nsNSSCertificateFakeTransport.cpp
index 088a5c4ed..088a5c4ed 100644
--- a/security/manager/ssl/nsNSSCertificateFakeTransport.cpp
+++ b/system/security/manager/ssl/nsNSSCertificateFakeTransport.cpp
diff --git a/security/manager/ssl/nsNSSCertificateFakeTransport.h b/system/security/manager/ssl/nsNSSCertificateFakeTransport.h
index 1c57505b4..1c57505b4 100644
--- a/security/manager/ssl/nsNSSCertificateFakeTransport.h
+++ b/system/security/manager/ssl/nsNSSCertificateFakeTransport.h
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/system/security/manager/ssl/nsNSSComponent.cpp
index 7880959c9..7880959c9 100644
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/system/security/manager/ssl/nsNSSComponent.cpp
diff --git a/security/manager/ssl/nsNSSComponent.h b/system/security/manager/ssl/nsNSSComponent.h
index e510dd10f..e510dd10f 100644
--- a/security/manager/ssl/nsNSSComponent.h
+++ b/system/security/manager/ssl/nsNSSComponent.h
diff --git a/security/manager/ssl/nsNSSErrors.cpp b/system/security/manager/ssl/nsNSSErrors.cpp
index 1613eb4e7..1613eb4e7 100644
--- a/security/manager/ssl/nsNSSErrors.cpp
+++ b/system/security/manager/ssl/nsNSSErrors.cpp
diff --git a/security/manager/ssl/nsNSSHelper.h b/system/security/manager/ssl/nsNSSHelper.h
index 005076099..005076099 100644
--- a/security/manager/ssl/nsNSSHelper.h
+++ b/system/security/manager/ssl/nsNSSHelper.h
diff --git a/security/manager/ssl/nsNSSIOLayer.cpp b/system/security/manager/ssl/nsNSSIOLayer.cpp
index 337ef8b8e..337ef8b8e 100644
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/system/security/manager/ssl/nsNSSIOLayer.cpp
diff --git a/security/manager/ssl/nsNSSIOLayer.h b/system/security/manager/ssl/nsNSSIOLayer.h
index b0b6281a8..b0b6281a8 100644
--- a/security/manager/ssl/nsNSSIOLayer.h
+++ b/system/security/manager/ssl/nsNSSIOLayer.h
diff --git a/security/manager/ssl/nsNSSModule.cpp b/system/security/manager/ssl/nsNSSModule.cpp
index 9012bb33f..9012bb33f 100644
--- a/security/manager/ssl/nsNSSModule.cpp
+++ b/system/security/manager/ssl/nsNSSModule.cpp
diff --git a/security/manager/ssl/nsNSSShutDown.cpp b/system/security/manager/ssl/nsNSSShutDown.cpp
index cffebac1e..cffebac1e 100644
--- a/security/manager/ssl/nsNSSShutDown.cpp
+++ b/system/security/manager/ssl/nsNSSShutDown.cpp
diff --git a/security/manager/ssl/nsNSSShutDown.h b/system/security/manager/ssl/nsNSSShutDown.h
index 00d017239..00d017239 100644
--- a/security/manager/ssl/nsNSSShutDown.h
+++ b/system/security/manager/ssl/nsNSSShutDown.h
diff --git a/security/manager/ssl/nsNSSU2FToken.cpp b/system/security/manager/ssl/nsNSSU2FToken.cpp
index 00d24594c..00d24594c 100644
--- a/security/manager/ssl/nsNSSU2FToken.cpp
+++ b/system/security/manager/ssl/nsNSSU2FToken.cpp
diff --git a/security/manager/ssl/nsNSSU2FToken.h b/system/security/manager/ssl/nsNSSU2FToken.h
index a48fbb9e7..a48fbb9e7 100644
--- a/security/manager/ssl/nsNSSU2FToken.h
+++ b/system/security/manager/ssl/nsNSSU2FToken.h
diff --git a/security/manager/ssl/nsNSSVersion.cpp b/system/security/manager/ssl/nsNSSVersion.cpp
index 854f7fb57..854f7fb57 100644
--- a/security/manager/ssl/nsNSSVersion.cpp
+++ b/system/security/manager/ssl/nsNSSVersion.cpp
diff --git a/security/manager/ssl/nsNSSVersion.h b/system/security/manager/ssl/nsNSSVersion.h
index 277a552e0..277a552e0 100644
--- a/security/manager/ssl/nsNSSVersion.h
+++ b/system/security/manager/ssl/nsNSSVersion.h
diff --git a/security/manager/ssl/nsNTLMAuthModule.cpp b/system/security/manager/ssl/nsNTLMAuthModule.cpp
index cfbb5f048..cfbb5f048 100644
--- a/security/manager/ssl/nsNTLMAuthModule.cpp
+++ b/system/security/manager/ssl/nsNTLMAuthModule.cpp
diff --git a/security/manager/ssl/nsNTLMAuthModule.h b/system/security/manager/ssl/nsNTLMAuthModule.h
index 27bf2999f..27bf2999f 100644
--- a/security/manager/ssl/nsNTLMAuthModule.h
+++ b/system/security/manager/ssl/nsNTLMAuthModule.h
diff --git a/security/manager/ssl/nsPK11TokenDB.cpp b/system/security/manager/ssl/nsPK11TokenDB.cpp
index 7743b7d5d..7743b7d5d 100644
--- a/security/manager/ssl/nsPK11TokenDB.cpp
+++ b/system/security/manager/ssl/nsPK11TokenDB.cpp
diff --git a/security/manager/ssl/nsPK11TokenDB.h b/system/security/manager/ssl/nsPK11TokenDB.h
index 1d29e592f..1d29e592f 100644
--- a/security/manager/ssl/nsPK11TokenDB.h
+++ b/system/security/manager/ssl/nsPK11TokenDB.h
diff --git a/security/manager/ssl/nsPKCS11Slot.cpp b/system/security/manager/ssl/nsPKCS11Slot.cpp
index e456c7d6c..e456c7d6c 100644
--- a/security/manager/ssl/nsPKCS11Slot.cpp
+++ b/system/security/manager/ssl/nsPKCS11Slot.cpp
diff --git a/security/manager/ssl/nsPKCS11Slot.h b/system/security/manager/ssl/nsPKCS11Slot.h
index 978df377c..978df377c 100644
--- a/security/manager/ssl/nsPKCS11Slot.h
+++ b/system/security/manager/ssl/nsPKCS11Slot.h
diff --git a/security/manager/ssl/nsPKCS12Blob.cpp b/system/security/manager/ssl/nsPKCS12Blob.cpp
index e3d80a398..e3d80a398 100644
--- a/security/manager/ssl/nsPKCS12Blob.cpp
+++ b/system/security/manager/ssl/nsPKCS12Blob.cpp
diff --git a/security/manager/ssl/nsPKCS12Blob.h b/system/security/manager/ssl/nsPKCS12Blob.h
index 35891182c..35891182c 100644
--- a/security/manager/ssl/nsPKCS12Blob.h
+++ b/system/security/manager/ssl/nsPKCS12Blob.h
diff --git a/security/manager/ssl/nsProtectedAuthThread.cpp b/system/security/manager/ssl/nsProtectedAuthThread.cpp
index ea511b24a..ea511b24a 100644
--- a/security/manager/ssl/nsProtectedAuthThread.cpp
+++ b/system/security/manager/ssl/nsProtectedAuthThread.cpp
diff --git a/security/manager/ssl/nsProtectedAuthThread.h b/system/security/manager/ssl/nsProtectedAuthThread.h
index d6bea8e13..d6bea8e13 100644
--- a/security/manager/ssl/nsProtectedAuthThread.h
+++ b/system/security/manager/ssl/nsProtectedAuthThread.h
diff --git a/security/manager/ssl/nsRandomGenerator.cpp b/system/security/manager/ssl/nsRandomGenerator.cpp
index 6e41fae60..6e41fae60 100644
--- a/security/manager/ssl/nsRandomGenerator.cpp
+++ b/system/security/manager/ssl/nsRandomGenerator.cpp
diff --git a/security/manager/ssl/nsRandomGenerator.h b/system/security/manager/ssl/nsRandomGenerator.h
index 197f2d747..197f2d747 100644
--- a/security/manager/ssl/nsRandomGenerator.h
+++ b/system/security/manager/ssl/nsRandomGenerator.h
diff --git a/security/manager/ssl/nsSSLSocketProvider.cpp b/system/security/manager/ssl/nsSSLSocketProvider.cpp
index c0fe8586f..c0fe8586f 100644
--- a/security/manager/ssl/nsSSLSocketProvider.cpp
+++ b/system/security/manager/ssl/nsSSLSocketProvider.cpp
diff --git a/security/manager/ssl/nsSSLSocketProvider.h b/system/security/manager/ssl/nsSSLSocketProvider.h
index 95132f204..95132f204 100644
--- a/security/manager/ssl/nsSSLSocketProvider.h
+++ b/system/security/manager/ssl/nsSSLSocketProvider.h
diff --git a/security/manager/ssl/nsSSLStatus.cpp b/system/security/manager/ssl/nsSSLStatus.cpp
index b2453d271..b2453d271 100644
--- a/security/manager/ssl/nsSSLStatus.cpp
+++ b/system/security/manager/ssl/nsSSLStatus.cpp
diff --git a/security/manager/ssl/nsSSLStatus.h b/system/security/manager/ssl/nsSSLStatus.h
index acba1cb30..acba1cb30 100644
--- a/security/manager/ssl/nsSSLStatus.h
+++ b/system/security/manager/ssl/nsSSLStatus.h
diff --git a/security/manager/ssl/nsSecureBrowserUIImpl.cpp b/system/security/manager/ssl/nsSecureBrowserUIImpl.cpp
index 4202a0142..4202a0142 100644
--- a/security/manager/ssl/nsSecureBrowserUIImpl.cpp
+++ b/system/security/manager/ssl/nsSecureBrowserUIImpl.cpp
diff --git a/security/manager/ssl/nsSecureBrowserUIImpl.h b/system/security/manager/ssl/nsSecureBrowserUIImpl.h
index 905e89474..905e89474 100644
--- a/security/manager/ssl/nsSecureBrowserUIImpl.h
+++ b/system/security/manager/ssl/nsSecureBrowserUIImpl.h
diff --git a/security/manager/ssl/nsSecurityHeaderParser.cpp b/system/security/manager/ssl/nsSecurityHeaderParser.cpp
index 9fb9f0d6d..9fb9f0d6d 100644
--- a/security/manager/ssl/nsSecurityHeaderParser.cpp
+++ b/system/security/manager/ssl/nsSecurityHeaderParser.cpp
diff --git a/security/manager/ssl/nsSecurityHeaderParser.h b/system/security/manager/ssl/nsSecurityHeaderParser.h
index eee29127e..eee29127e 100644
--- a/security/manager/ssl/nsSecurityHeaderParser.h
+++ b/system/security/manager/ssl/nsSecurityHeaderParser.h
diff --git a/security/manager/ssl/nsSiteSecurityService.cpp b/system/security/manager/ssl/nsSiteSecurityService.cpp
index 5a6ff3d46..5a6ff3d46 100644
--- a/security/manager/ssl/nsSiteSecurityService.cpp
+++ b/system/security/manager/ssl/nsSiteSecurityService.cpp
diff --git a/security/manager/ssl/nsSiteSecurityService.h b/system/security/manager/ssl/nsSiteSecurityService.h
index 9395cd092..9395cd092 100644
--- a/security/manager/ssl/nsSiteSecurityService.h
+++ b/system/security/manager/ssl/nsSiteSecurityService.h
diff --git a/security/manager/ssl/nsSmartCardMonitor.cpp b/system/security/manager/ssl/nsSmartCardMonitor.cpp
index 3423d4f5f..3423d4f5f 100644
--- a/security/manager/ssl/nsSmartCardMonitor.cpp
+++ b/system/security/manager/ssl/nsSmartCardMonitor.cpp
diff --git a/security/manager/ssl/nsSmartCardMonitor.h b/system/security/manager/ssl/nsSmartCardMonitor.h
index bfadf31e8..bfadf31e8 100644
--- a/security/manager/ssl/nsSmartCardMonitor.h
+++ b/system/security/manager/ssl/nsSmartCardMonitor.h
diff --git a/security/manager/ssl/nsTLSSocketProvider.cpp b/system/security/manager/ssl/nsTLSSocketProvider.cpp
index 190dd7769..190dd7769 100644
--- a/security/manager/ssl/nsTLSSocketProvider.cpp
+++ b/system/security/manager/ssl/nsTLSSocketProvider.cpp
diff --git a/security/manager/ssl/nsTLSSocketProvider.h b/system/security/manager/ssl/nsTLSSocketProvider.h
index 5fa6e670b..5fa6e670b 100644
--- a/security/manager/ssl/nsTLSSocketProvider.h
+++ b/system/security/manager/ssl/nsTLSSocketProvider.h
diff --git a/security/manager/ssl/nsVerificationJob.h b/system/security/manager/ssl/nsVerificationJob.h
index 3bf4c6a5b..3bf4c6a5b 100644
--- a/security/manager/ssl/nsVerificationJob.h
+++ b/system/security/manager/ssl/nsVerificationJob.h
diff --git a/security/manager/ssl/tests/.eslintrc.js b/system/security/manager/ssl/tests/.eslintrc.js
index a2a4eb389..a2a4eb389 100644
--- a/security/manager/ssl/tests/.eslintrc.js
+++ b/system/security/manager/ssl/tests/.eslintrc.js
diff --git a/security/manager/ssl/tests/gtest/CertDBTest.cpp b/system/security/manager/ssl/tests/gtest/CertDBTest.cpp
index e6b773cd6..e6b773cd6 100644
--- a/security/manager/ssl/tests/gtest/CertDBTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/CertDBTest.cpp
diff --git a/security/manager/ssl/tests/gtest/DataStorageTest.cpp b/system/security/manager/ssl/tests/gtest/DataStorageTest.cpp
index 252f5d3b4..252f5d3b4 100644
--- a/security/manager/ssl/tests/gtest/DataStorageTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/DataStorageTest.cpp
diff --git a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp b/system/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp
index 57a9ea8cf..57a9ea8cf 100644
--- a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp
diff --git a/security/manager/ssl/tests/gtest/MD4Test.cpp b/system/security/manager/ssl/tests/gtest/MD4Test.cpp
index 22a58be75..22a58be75 100644
--- a/security/manager/ssl/tests/gtest/MD4Test.cpp
+++ b/system/security/manager/ssl/tests/gtest/MD4Test.cpp
diff --git a/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp b/system/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
index 8a498d5ad..8a498d5ad 100644
--- a/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
diff --git a/security/manager/ssl/tests/gtest/README.txt b/system/security/manager/ssl/tests/gtest/README.txt
index 0e5132269..0e5132269 100644
--- a/security/manager/ssl/tests/gtest/README.txt
+++ b/system/security/manager/ssl/tests/gtest/README.txt
diff --git a/security/manager/ssl/tests/gtest/STSParserTest.cpp b/system/security/manager/ssl/tests/gtest/STSParserTest.cpp
index bedf57fea..bedf57fea 100644
--- a/security/manager/ssl/tests/gtest/STSParserTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/STSParserTest.cpp
diff --git a/security/manager/ssl/tests/gtest/TLSIntoleranceTest.cpp b/system/security/manager/ssl/tests/gtest/TLSIntoleranceTest.cpp
index 231dbc799..231dbc799 100644
--- a/security/manager/ssl/tests/gtest/TLSIntoleranceTest.cpp
+++ b/system/security/manager/ssl/tests/gtest/TLSIntoleranceTest.cpp
diff --git a/security/manager/ssl/tests/gtest/moz.build b/system/security/manager/ssl/tests/gtest/moz.build
index b975b9cfa..b975b9cfa 100644
--- a/security/manager/ssl/tests/gtest/moz.build
+++ b/system/security/manager/ssl/tests/gtest/moz.build
diff --git a/security/manager/ssl/tests/mochitest/browser/.eslintrc.js b/system/security/manager/ssl/tests/mochitest/browser/.eslintrc.js
index c15988365..c15988365 100644
--- a/security/manager/ssl/tests/mochitest/browser/.eslintrc.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/.eslintrc.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser.ini b/system/security/manager/ssl/tests/mochitest/browser/browser.ini
index 3c91ceb80..3c91ceb80 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser.ini
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser.ini
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js b/system/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js
index 081521ca9..081521ca9 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js b/system/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
index d75f9f207..d75f9f207 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js b/system/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
index d1db319d0..d1db319d0 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js b/system/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
index 6362fd34d..6362fd34d 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_ui.js b/system/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_ui.js
index bf4f179c0..bf4f179c0 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_ui.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_ui.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js b/system/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
index b0ac8f95c..b0ac8f95c 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js b/system/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
index cbd59f883..cbd59f883 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js b/system/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
index bc87732a5..bc87732a5 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js b/system/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
index fc7591ece..fc7591ece 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
diff --git a/security/manager/ssl/tests/mochitest/browser/ca.pem b/system/security/manager/ssl/tests/mochitest/browser/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/mochitest/browser/ca.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/ca.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/ca.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/ca.pem.certspec
index 6660f5d47..6660f5d47 100644
--- a/security/manager/ssl/tests/mochitest/browser/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/ca.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/code-ee.pem b/system/security/manager/ssl/tests/mochitest/browser/code-ee.pem
index a4fdfaed7..a4fdfaed7 100644
--- a/security/manager/ssl/tests/mochitest/browser/code-ee.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/code-ee.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/code-ee.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/code-ee.pem.certspec
index 93f9a8426..93f9a8426 100644
--- a/security/manager/ssl/tests/mochitest/browser/code-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/code-ee.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem b/system/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
index 5b2cfd940..5b2cfd940 100644
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem.certspec
index 3e280fc4f..3e280fc4f 100644
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem b/system/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
index ad2d988e0..ad2d988e0 100644
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem.certspec
index 833e1a23a..833e1a23a 100644
--- a/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/email-ee.pem b/system/security/manager/ssl/tests/mochitest/browser/email-ee.pem
index 4211ef27d..4211ef27d 100644
--- a/security/manager/ssl/tests/mochitest/browser/email-ee.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/email-ee.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/email-ee.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/email-ee.pem.certspec
index 82e329670..82e329670 100644
--- a/security/manager/ssl/tests/mochitest/browser/email-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/email-ee.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/expired-ca.pem b/system/security/manager/ssl/tests/mochitest/browser/expired-ca.pem
index 2da553a56..2da553a56 100644
--- a/security/manager/ssl/tests/mochitest/browser/expired-ca.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/expired-ca.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/expired-ca.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/expired-ca.pem.certspec
index 15bdcd7d7..15bdcd7d7 100644
--- a/security/manager/ssl/tests/mochitest/browser/expired-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/expired-ca.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/has-cn.pem b/system/security/manager/ssl/tests/mochitest/browser/has-cn.pem
index 8e7c479ae..8e7c479ae 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-cn.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-cn.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/has-cn.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/has-cn.pem.certspec
index a4a0fcb5f..a4a0fcb5f 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-cn.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-cn.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem b/system/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
index 8800bfb73..8800bfb73 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem.certspec
index 6346f7b83..6346f7b83 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem b/system/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
index 16964b1c0..16964b1c0 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem.certspec
index cc1b668a6..cc1b668a6 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/has-o.pem b/system/security/manager/ssl/tests/mochitest/browser/has-o.pem
index 755d3cdae..755d3cdae 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-o.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-o.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/has-o.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/has-o.pem.certspec
index f7cc3ffc7..f7cc3ffc7 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-o.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-o.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/has-ou.pem b/system/security/manager/ssl/tests/mochitest/browser/has-ou.pem
index 06f663b3f..06f663b3f 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-ou.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-ou.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/has-ou.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/has-ou.pem.certspec
index 8879dabf5..8879dabf5 100644
--- a/security/manager/ssl/tests/mochitest/browser/has-ou.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/has-ou.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/head.js b/system/security/manager/ssl/tests/mochitest/browser/head.js
index d488e6eeb..d488e6eeb 100644
--- a/security/manager/ssl/tests/mochitest/browser/head.js
+++ b/system/security/manager/ssl/tests/mochitest/browser/head.js
diff --git a/security/manager/ssl/tests/mochitest/browser/invalid.pem b/system/security/manager/ssl/tests/mochitest/browser/invalid.pem
index 1911098ef..1911098ef 100644
--- a/security/manager/ssl/tests/mochitest/browser/invalid.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/invalid.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/invalid.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/invalid.pem.certspec
index 71a1707c3..71a1707c3 100644
--- a/security/manager/ssl/tests/mochitest/browser/invalid.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/invalid.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/md5-ee.pem b/system/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
index 27bf90085..27bf90085 100644
--- a/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/md5-ee.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/md5-ee.pem.certspec
index 279c15802..279c15802 100644
--- a/security/manager/ssl/tests/mochitest/browser/md5-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/md5-ee.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/moz.build b/system/security/manager/ssl/tests/mochitest/browser/moz.build
index 25b951c34..25b951c34 100644
--- a/security/manager/ssl/tests/mochitest/browser/moz.build
+++ b/system/security/manager/ssl/tests/mochitest/browser/moz.build
diff --git a/security/manager/ssl/tests/mochitest/browser/revoked.pem b/system/security/manager/ssl/tests/mochitest/browser/revoked.pem
index b212e8250..b212e8250 100644
--- a/security/manager/ssl/tests/mochitest/browser/revoked.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/revoked.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/revoked.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/revoked.pem.certspec
index daf75c670..daf75c670 100644
--- a/security/manager/ssl/tests/mochitest/browser/revoked.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/revoked.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem b/system/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
index 76a688034..76a688034 100644
--- a/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem.certspec
index c4037675f..c4037675f 100644
--- a/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem b/system/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
index d8e750551..d8e750551 100644
--- a/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem.certspec
index c76a4e2c7..c76a4e2c7 100644
--- a/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem b/system/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
index 0f874d9a9..0f874d9a9 100644
--- a/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
+++ b/system/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
diff --git a/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem.certspec b/system/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem.certspec
index 04f443057..04f443057 100644
--- a/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem.certspec
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/.eslintrc.js b/system/security/manager/ssl/tests/mochitest/mixedcontent/.eslintrc.js
index d61bb2044..d61bb2044 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/.eslintrc.js
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/.eslintrc.js
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs
index 8e9afb098..8e9afb098 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/backward.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/backward.html
index 825c2aa80..825c2aa80 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/backward.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/backward.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js
index fd888504a..fd888504a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
index c2ebce364..c2ebce364 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html
index 1acafcd2f..1acafcd2f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/download.auto b/system/security/manager/ssl/tests/mochitest/mixedcontent/download.auto
index 4d2fb7d5a..4d2fb7d5a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/download.auto
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/download.auto
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/download.auto^headers^ b/system/security/manager/ssl/tests/mochitest/mixedcontent/download.auto^headers^
index 9c3159e15..9c3159e15 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/download.auto^headers^
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/download.auto^headers^
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs
index 5cce2826f..5cce2826f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs
index 20d9dea82..20d9dea82 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html
index d67eb6a7a..d67eb6a7a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
index 048ed811b..048ed811b 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
index d033f5b00..d033f5b00 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
index ea93b80b7..ea93b80b7 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
index 937e29954..937e29954 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
index 7af6116e1..7af6116e1 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
index a8eb26642..a8eb26642 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js b/system/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
index 74c592e59..74c592e59 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini b/system/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
index c7a352eb8..c7a352eb8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg b/system/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg
index c0ffca256..c0ffca256 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/moz.build b/system/security/manager/ssl/tests/mochitest/mixedcontent/moz.build
index 034ba3628..034ba3628 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/moz.build
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/moz.build
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs
index 53fa4bc0c..53fa4bc0c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs b/system/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
index 4d85e1658..4d85e1658 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css b/system/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css
index 9867e3c41..9867e3c41 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
index 596b65628..596b65628 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
index b68546d0a..b68546d0a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
index ec2b8590a..ec2b8590a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
index b95cfcf65..b95cfcf65 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug477118.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug477118.html
index 51a13a4b8..51a13a4b8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug477118.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug477118.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
index 523b97f59..523b97f59 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
index 72046e032..72046e032 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
index 364d652f4..364d652f4 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
index c57410b74..c57410b74 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
index 64eec0890..64eec0890 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
index 41878d292..41878d292 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
index 4f7305f41..4f7305f41 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
index 7dbfdf4da..7dbfdf4da 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
index 6d06f1a64..6d06f1a64 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
index f846f8919..f846f8919 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
index cbb5dccf8..cbb5dccf8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
index 64a7a4abe..64a7a4abe 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
index c1af7b29d..c1af7b29d 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
index 5e408b2aa..5e408b2aa 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
index ff3592542..ff3592542 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_javascriptPicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_javascriptPicture.html
index 1efbe4d73..1efbe4d73 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_javascriptPicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_javascriptPicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
index cd9f1d0d7..cd9f1d0d7 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
index 96ef9a3c7..96ef9a3c7 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
index 0f741f9b8..0f741f9b8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
index 19d1379ea..19d1379ea 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
index dd4bd2d8f..dd4bd2d8f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
index cdd59ce15..cdd59ce15 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
index 288526437..288526437 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
index 1095c769f..1095c769f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
index dc18efa29..dc18efa29 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureDup.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureDup.html
index 5d02de95c..5d02de95c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureDup.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureDup.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
index 2ece07342..2ece07342 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
index a796b41b5..a796b41b5 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
index 228267741..228267741 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html b/system/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
index f53fb4830..f53fb4830 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
+++ b/system/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
diff --git a/security/manager/ssl/tests/mochitest/moz.build b/system/security/manager/ssl/tests/mochitest/moz.build
index 7aa3aa251..7aa3aa251 100644
--- a/security/manager/ssl/tests/mochitest/moz.build
+++ b/system/security/manager/ssl/tests/mochitest/moz.build
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/.eslintrc.js b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/.eslintrc.js
index 74b7a1a07..74b7a1a07 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/.eslintrc.js
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/.eslintrc.js
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
index b2ce8fef0..b2ce8fef0 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
index 100f45840..100f45840 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/moz.build b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/moz.build
index 4ccdba504..4ccdba504 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/moz.build
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/moz.build
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html
index f9b0f9381..f9b0f9381 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html^headers^ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html^headers^
index 9e23c73b7..9e23c73b7 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html^headers^
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/nosts_bootstrap.html^headers^
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html
index db5d31a96..db5d31a96 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html
index f9b0f9381..f9b0f9381 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html^headers^ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html^headers^
index a46bf65bd..a46bf65bd 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html^headers^
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/plain_bootstrap.html^headers^
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html
index 24a364158..24a364158 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html^headers^ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html^headers^
index e54fc6a1d..e54fc6a1d 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html^headers^
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/subdom_bootstrap.html^headers^
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
index 675688638..675688638 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
index 882030b67..882030b67 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/verify.sjs b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/verify.sjs
index e5e4eb5f6..e5e4eb5f6 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/verify.sjs
+++ b/system/security/manager/ssl/tests/mochitest/stricttransportsecurity/verify.sjs
diff --git a/security/manager/ssl/tests/moz.build b/system/security/manager/ssl/tests/moz.build
index 942842ae9..942842ae9 100644
--- a/security/manager/ssl/tests/moz.build
+++ b/system/security/manager/ssl/tests/moz.build
diff --git a/security/manager/ssl/tests/unit/.eslintrc.js b/system/security/manager/ssl/tests/unit/.eslintrc.js
index 1f96e7821..1f96e7821 100644
--- a/security/manager/ssl/tests/unit/.eslintrc.js
+++ b/system/security/manager/ssl/tests/unit/.eslintrc.js
diff --git a/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem b/system/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
index 62406aaac..62406aaac 100644
--- a/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem.certspec
index 1b368c26f..1b368c26f 100644
--- a/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
index ffb961c45..ffb961c45 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem.certspec
index ac97b2231..ac97b2231 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpoch.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
index 62ddea52a..62ddea52a 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem.certspec
index 835e63f2b..835e63f2b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochINT.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
index c234f9365..c234f9365 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem.certspec
index 9aabe2162..9aabe2162 100644
--- a/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem b/system/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
index ae40112c3..ae40112c3 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem.certspec
index 8e16705b5..8e16705b5 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/default-ee.key b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/bad_certs/default-ee.key
+++ b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.key
diff --git a/security/manager/ssl/tests/unit/bad_certs/default-ee.key.keyspec b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/bad_certs/default-ee.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.key.keyspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/default-ee.pem b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
index 0a9eaebb5..0a9eaebb5 100644
--- a/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/default-ee.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.pem.certspec
index 554339ff5..554339ff5 100644
--- a/security/manager/ssl/tests/unit/bad_certs/default-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/default-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
index 08c574fd1..08c574fd1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem.certspec
index 63c36d34b..63c36d34b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
index e24448493..e24448493 100644
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem.certspec
index 9ed9b33db..9ed9b33db 100644
--- a/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem b/system/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
index 719f4e760..719f4e760 100644
--- a/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem.certspec
index a99d84b79..a99d84b79 100644
--- a/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem b/system/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
index 1946feeb1..1946feeb1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem.certspec
index 0a7cfdfd8..0a7cfdfd8 100644
--- a/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem b/system/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
index dc231eafb..dc231eafb 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem.certspec
index d5b585967..d5b585967 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/ev-test.pem b/system/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
index 7bdcf4d4d..7bdcf4d4d 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/ev-test.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/ev-test.pem.certspec
index 10f802258..10f802258 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ev-test.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ev-test.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/evroot.key b/system/security/manager/ssl/tests/unit/bad_certs/evroot.key
index a756a0705..a756a0705 100644
--- a/security/manager/ssl/tests/unit/bad_certs/evroot.key
+++ b/system/security/manager/ssl/tests/unit/bad_certs/evroot.key
diff --git a/security/manager/ssl/tests/unit/bad_certs/evroot.key.keyspec b/system/security/manager/ssl/tests/unit/bad_certs/evroot.key.keyspec
index 1a3d76a55..1a3d76a55 100644
--- a/security/manager/ssl/tests/unit/bad_certs/evroot.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/evroot.key.keyspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/evroot.pem b/system/security/manager/ssl/tests/unit/bad_certs/evroot.pem
index cd2fd7ed8..cd2fd7ed8 100644
--- a/security/manager/ssl/tests/unit/bad_certs/evroot.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/evroot.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/evroot.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/evroot.pem.certspec
index 3121f3486..3121f3486 100644
--- a/security/manager/ssl/tests/unit/bad_certs/evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem b/system/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
index 3c97dc9f3..3c97dc9f3 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem.certspec
index 0a03bc36f..0a03bc36f 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expired-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem b/system/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
index c6e51c000..c6e51c000 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem.certspec
index 38a0abd8a..38a0abd8a 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expiredINT.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem b/system/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
index ff00cc00b..ff00cc00b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem.certspec
index 855f45422..855f45422 100644
--- a/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem b/system/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
index f8baeea9f..f8baeea9f 100644
--- a/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem.certspec
index b3d840fbd..b3d840fbd 100644
--- a/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key
index d10324fb3..d10324fb3 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key.keyspec b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key.keyspec
index 21ed73d60..21ed73d60 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.key.keyspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
index 2ad219824..2ad219824 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem.certspec
index 02b595dc9..02b595dc9 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem b/system/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
index 7e73075c1..7e73075c1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem.certspec
index 4d553890b..4d553890b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem b/system/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
index 6b7c848a1..6b7c848a1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem.certspec
index 766233847..766233847 100644
--- a/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem b/system/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
index b81dbafa4..b81dbafa4 100644
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem.certspec
index e4c2b7008..e4c2b7008 100644
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/md5signature-expired.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/md5signature.pem b/system/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
index de1317577..de1317577 100644
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/md5signature.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/md5signature.pem.certspec
index 02742d910..02742d910 100644
--- a/security/manager/ssl/tests/unit/bad_certs/md5signature.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/md5signature.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
index 9924dfb7e..9924dfb7e 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem.certspec
index 262f08d6b..262f08d6b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-expired.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
index bfbb973c1..bfbb973c1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem.certspec
index 947eb7d67..947eb7d67 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-notYetValid.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
index 47c8d4c3a..47c8d4c3a 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem.certspec
index adc8ebaf8..adc8ebaf8 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted-expired.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
index 723ed4dae..723ed4dae 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem.certspec
index 91c5f548b..91c5f548b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
index 205fa23b9..205fa23b9 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatch.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatch.pem.certspec
index b93599fc8..b93599fc8 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatch.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatch.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem b/system/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
index 004ce48e6..004ce48e6 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem.certspec
index 86ef45b7c..86ef45b7c 100644
--- a/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/moz.build b/system/security/manager/ssl/tests/unit/bad_certs/moz.build
index 704c4c198..704c4c198 100644
--- a/security/manager/ssl/tests/unit/bad_certs/moz.build
+++ b/system/security/manager/ssl/tests/unit/bad_certs/moz.build
diff --git a/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem b/system/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
index 36d258cb0..36d258cb0 100644
--- a/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem.certspec
index 87088e87e..87088e87e 100644
--- a/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem b/system/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
index a380ffc9a..a380ffc9a 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem.certspec
index 5b60c29eb..5b60c29eb 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValid.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
index aa4a031d3..aa4a031d3 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem.certspec
index 8a00f2ee2..8a00f2ee2 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidINT.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
index 10e11c82c..10e11c82c 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem.certspec
index d8420898e..d8420898e 100644
--- a/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
index 0602dbb8f..0602dbb8f 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem.certspec
index b236bdea4..b236bdea4 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
index 24d6ba742..24d6ba742 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem.certspec
index 0ae63e20f..0ae63e20f 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
index b894c0bce..b894c0bce 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem.certspec
index a44a1feee..a44a1feee 100644
--- a/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem b/system/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
index 13ba23a19..13ba23a19 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem.certspec
index a905a66ac..a905a66ac 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key
index 6db74b5c5..6db74b5c5 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key.keyspec b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key.keyspec
index cbd5f309c..cbd5f309c 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.key.keyspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
index 09bd4bb04..09bd4bb04 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem.certspec
index 3bc975aa2..3bc975aa2 100644
--- a/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/other-test-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem b/system/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
index badc58376..badc58376 100644
--- a/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem.certspec
index 0ca92d7fd..0ca92d7fd 100644
--- a/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
index 87b0ca2e7..87b0ca2e7 100644
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem.certspec
index 477b90ce1..477b90ce1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
index 436f9ef8e..436f9ef8e 100644
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem.certspec
index 99a814be1..99a814be1 100644
--- a/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/test-ca.pem b/system/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
index 1d50176e4..1d50176e4 100644
--- a/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/test-ca.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/test-ca.pem.certspec
index 5d2435d7b..5d2435d7b 100644
--- a/security/manager/ssl/tests/unit/bad_certs/test-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/test-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/test-int.pem b/system/security/manager/ssl/tests/unit/bad_certs/test-int.pem
index df9ad3ddb..df9ad3ddb 100644
--- a/security/manager/ssl/tests/unit/bad_certs/test-int.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/test-int.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/test-int.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/test-int.pem.certspec
index 33b42c2f4..33b42c2f4 100644
--- a/security/manager/ssl/tests/unit/bad_certs/test-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/test-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem b/system/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
index d9ba29653..d9ba29653 100644
--- a/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem.certspec
index a735c730c..a735c730c 100644
--- a/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem b/system/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
index 497b3472c..497b3472c 100644
--- a/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem.certspec
index 3efd1ce67..3efd1ce67 100644
--- a/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/untrusted-expired.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem b/system/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
index 842e7e7bd..842e7e7bd 100644
--- a/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem.certspec
index 5ba0bc253..5ba0bc253 100644
--- a/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem b/system/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
index c6e59a7a8..c6e59a7a8 100644
--- a/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
+++ b/system/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
diff --git a/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem.certspec b/system/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem.certspec
index 7824630bb..7824630bb 100644
--- a/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem.certspec
diff --git a/security/manager/ssl/tests/unit/head_psm.js b/system/security/manager/ssl/tests/unit/head_psm.js
index b6489d605..b6489d605 100644
--- a/security/manager/ssl/tests/unit/head_psm.js
+++ b/system/security/manager/ssl/tests/unit/head_psm.js
diff --git a/security/manager/ssl/tests/unit/moz.build b/system/security/manager/ssl/tests/unit/moz.build
index 2aee67407..2aee67407 100644
--- a/security/manager/ssl/tests/unit/moz.build
+++ b/system/security/manager/ssl/tests/unit/moz.build
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
index ae40112c3..ae40112c3 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem.certspec
index 8e16705b5..8e16705b5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key.keyspec b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.key.keyspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
index 0a9eaebb5..0a9eaebb5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem.certspec
index 554339ff5..554339ff5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
index c002ab376..c002ab376 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem.certspec
index bdf3e2ee4..bdf3e2ee4 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
index a89c8d2f7..a89c8d2f7 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem.certspec
index 19971eeb4..19971eeb4 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
index ace363638..ace363638 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem.certspec
index be0d3e9e5..be0d3e9e5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
index e3ce67d25..e3ce67d25 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem.certspec
index 2833ed9b5..2833ed9b5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
index 3f00a11b7..3f00a11b7 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem.certspec
index 92444c94a..92444c94a 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
index b1a665aa9..b1a665aa9 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem.certspec
index bc704fbd4..bc704fbd4 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/moz.build b/system/security/manager/ssl/tests/unit/ocsp_certs/moz.build
index e20d1e599..e20d1e599 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/moz.build
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/moz.build
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
index 3590df90b..3590df90b 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem.certspec
index 3fa2793b3..3fa2793b3 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
index 9902cf34e..9902cf34e 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem.certspec
index 7a8dd223d..7a8dd223d 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
index f11b4b0cf..f11b4b0cf 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem.certspec
index 352a60675..352a60675 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
index 9ad410a12..9ad410a12 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem.certspec
index 2cda40dc0..2cda40dc0 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
index 356235d2c..356235d2c 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem.certspec
index 8e4a6ac0c..8e4a6ac0c 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
index af8f05578..af8f05578 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem.certspec
index ae3a51565..ae3a51565 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
index 0e9090fec..0e9090fec 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem.certspec
index 5756f6ab5..5756f6ab5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key
index 6db74b5c5..6db74b5c5 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key.keyspec b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key.keyspec
index cbd5f309c..cbd5f309c 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.key.keyspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
index 09bd4bb04..09bd4bb04 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem.certspec
index 3bc975aa2..3bc975aa2 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/other-test-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key
index d10324fb3..d10324fb3 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key.keyspec b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key.keyspec
index 21ed73d60..21ed73d60 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.key.keyspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
index a6951536f..a6951536f 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem.certspec
index 05f73368a..05f73368a 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
index 1d50176e4..1d50176e4 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem.certspec
index 5d2435d7b..5d2435d7b 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
index df9ad3ddb..df9ad3ddb 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem.certspec
index 33b42c2f4..33b42c2f4 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
index bed4aa01f..bed4aa01f 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem.certspec
index 3f0e925aa..3f0e925aa 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem b/system/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
index d00c3d101..d00c3d101 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
diff --git a/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem.certspec b/system/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem.certspec
index 7c29aa0ad..7c29aa0ad 100644
--- a/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/pkcs11testmodule/moz.build b/system/security/manager/ssl/tests/unit/pkcs11testmodule/moz.build
index 03a2f9f5a..03a2f9f5a 100644
--- a/security/manager/ssl/tests/unit/pkcs11testmodule/moz.build
+++ b/system/security/manager/ssl/tests/unit/pkcs11testmodule/moz.build
diff --git a/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.cpp b/system/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.cpp
index 531da1308..531da1308 100644
--- a/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.cpp
+++ b/system/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.cpp
diff --git a/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.symbols b/system/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.symbols
index 562ecea21..562ecea21 100644
--- a/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.symbols
+++ b/system/security/manager/ssl/tests/unit/pkcs11testmodule/pkcs11testmodule.symbols
diff --git a/security/manager/ssl/tests/unit/pycert.py b/system/security/manager/ssl/tests/unit/pycert.py
index 9c8efa915..9c8efa915 100755..100644
--- a/security/manager/ssl/tests/unit/pycert.py
+++ b/system/security/manager/ssl/tests/unit/pycert.py
diff --git a/security/manager/ssl/tests/unit/pykey.py b/system/security/manager/ssl/tests/unit/pykey.py
index d3c43deb4..d3c43deb4 100755..100644
--- a/security/manager/ssl/tests/unit/pykey.py
+++ b/system/security/manager/ssl/tests/unit/pykey.py
diff --git a/security/manager/ssl/tests/unit/sss_readstate_child_worker.js b/system/security/manager/ssl/tests/unit/sss_readstate_child_worker.js
index 166ab9ed3..166ab9ed3 100644
--- a/security/manager/ssl/tests/unit/sss_readstate_child_worker.js
+++ b/system/security/manager/ssl/tests/unit/sss_readstate_child_worker.js
diff --git a/security/manager/ssl/tests/unit/test_add_preexisting_cert.js b/system/security/manager/ssl/tests/unit/test_add_preexisting_cert.js
index 2b07828c8..2b07828c8 100644
--- a/security/manager/ssl/tests/unit/test_add_preexisting_cert.js
+++ b/system/security/manager/ssl/tests/unit/test_add_preexisting_cert.js
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem.certspec
index 6660f5d47..6660f5d47 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build b/system/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build
index ea6bf95f6..ea6bf95f6 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/moz.build
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
index 4a0032f43..4a0032f43 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem.certspec
index 7a34d0758..7a34d0758 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-old.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
index 370cafc8f..370cafc8f 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem.certspec
index aa682a7af..aa682a7af 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-older.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
index f901f613b..f901f613b 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem.certspec
index e38478165..e38478165 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/no-san-recent.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
index 2d6821a7c..2d6821a7c 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem.certspec
index 41817bde7..41817bde7 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-old.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
index 0465f5da5..0465f5da5 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem.certspec
index 65acf0b02..65acf0b02 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-older.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
index fc8b5b48a..fc8b5b48a 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem.certspec b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem.certspec
index 140c20143..140c20143 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements/san-contains-no-hostnames-recent.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_baseline_requirements_subject_common_name.js b/system/security/manager/ssl/tests/unit/test_baseline_requirements_subject_common_name.js
index 8917671b8..8917671b8 100644
--- a/security/manager/ssl/tests/unit/test_baseline_requirements_subject_common_name.js
+++ b/system/security/manager/ssl/tests/unit/test_baseline_requirements_subject_common_name.js
diff --git a/security/manager/ssl/tests/unit/test_certDB_import.js b/system/security/manager/ssl/tests/unit/test_certDB_import.js
index f53fbf0ef..f53fbf0ef 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import.js
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import.js
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/cert_from_windows.pfx b/system/security/manager/ssl/tests/unit/test_certDB_import/cert_from_windows.pfx
index e969d672d..e969d672d 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/cert_from_windows.pfx
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/cert_from_windows.pfx
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem b/system/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
index 72b6371e2..72b6371e2 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem.certspec b/system/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem.certspec
index 0528bc624..0528bc624 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem b/system/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
index 77ec4cbac..77ec4cbac 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem.certspec b/system/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem.certspec
index b16825354..b16825354 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_certDB_import/moz.build b/system/security/manager/ssl/tests/unit/test_certDB_import/moz.build
index 1d111f8c6..1d111f8c6 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import/moz.build
diff --git a/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js b/system/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js
index 56e17855a..56e17855a 100644
--- a/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js
+++ b/system/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js
diff --git a/security/manager/ssl/tests/unit/test_cert_blocklist.js b/system/security/manager/ssl/tests/unit/test_cert_blocklist.js
index 75688b58a..75688b58a 100644
--- a/security/manager/ssl/tests/unit/test_cert_blocklist.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_blocklist.js
diff --git a/security/manager/ssl/tests/unit/test_cert_chains.js b/system/security/manager/ssl/tests/unit/test_cert_chains.js
index dd1fc9369..dd1fc9369 100644
--- a/security/manager/ssl/tests/unit/test_cert_chains.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_chains.js
diff --git a/security/manager/ssl/tests/unit/test_cert_dbKey.js b/system/security/manager/ssl/tests/unit/test_cert_dbKey.js
index ca47a4997..ca47a4997 100644
--- a/security/manager/ssl/tests/unit/test_cert_dbKey.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_dbKey.js
diff --git a/security/manager/ssl/tests/unit/test_cert_eku.js b/system/security/manager/ssl/tests/unit/test_cert_eku.js
index 5a7e28de1..5a7e28de1 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku.js
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ca.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ca.pem
index f9bc514d4..f9bc514d4 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ca.pem.certspec
index eb7c4b4be..eb7c4b4be 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
index a92b75aab..a92b75aab 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem.certspec
index d49cabaa2..d49cabaa2 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
index e213e4494..e213e4494 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem.certspec
index 5250cc4a8..5250cc4a8 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
index 926ccbe8e..926ccbe8e 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem.certspec
index 3b3eff9ae..3b3eff9ae 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
index 177e17a7f..177e17a7f 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem.certspec
index 4c51425ce..4c51425ce 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
index 0b01c231a..0b01c231a 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem.certspec
index 690f579af..690f579af 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
index 3e37a4a72..3e37a4a72 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem.certspec
index 670973930..670973930 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
index 0c95864e7..0c95864e7 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem.certspec
index bd012ab71..bd012ab71 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
index 6f6b17601..6f6b17601 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem.certspec
index 2374d248f..2374d248f 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
index 4345d995c..4345d995c 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem.certspec
index 6c3cb6473..6c3cb6473 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
index 97ea224d6..97ea224d6 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem.certspec
index 72ddb78df..72ddb78df 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
index 703d5b29b..703d5b29b 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem.certspec
index c8444d337..c8444d337 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-old.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
index 45bab52a7..45bab52a7 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem.certspec
index c5b12e8da..c5b12e8da 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-older.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
index 3bf0f2bac..3bf0f2bac 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem.certspec
index 6e736adc0..6e736adc0 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-int-nsSGC-recent.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
index 6849a15ae..6849a15ae 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem.certspec
index 43d58ab6d..43d58ab6d 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
index 67125227d..67125227d 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem.certspec
index e5bc18198..e5bc18198 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
index aaa392db5..aaa392db5 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem.certspec
index 94e9a42d4..94e9a42d4 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
index e487b8ef6..e487b8ef6 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem.certspec
index c38a640b9..c38a640b9 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
index 29c734bb6..29c734bb6 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem.certspec
index c84201d87..c84201d87 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
index 538b6d2ce..538b6d2ce 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem.certspec
index 74bec2b21..74bec2b21 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
index 0d20e07ec..0d20e07ec 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem.certspec
index 35f61671e..35f61671e 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-old.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
index f42288896..f42288896 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem.certspec
index f7a870c0f..f7a870c0f 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-older.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
index a2a6dfd89..a2a6dfd89 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem.certspec
index f421ddc1a..f421ddc1a 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/int-nsSGC-recent.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_eku/moz.build b/system/security/manager/ssl/tests/unit/test_cert_eku/moz.build
index 7a8608171..7a8608171 100644
--- a/security/manager/ssl/tests/unit/test_cert_eku/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_eku/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null.js b/system/security/manager/ssl/tests/unit/test_cert_embedded_null.js
index 4e4767560..4e4767560 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null.js
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem.certspec
index 6660f5d47..6660f5d47 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
index 7e846ed83..7e846ed83 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem.certspec
index d1a32349a..d1a32349a 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
index af4572d66..af4572d66 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem.certspec
index 1029d6cdd..1029d6cdd 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
index b0e05c6b9..b0e05c6b9 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem.certspec
index f224888ee..f224888ee 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
index b0672452f..b0672452f 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem.certspec
index d352d034b..d352d034b 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build
index 5526000e1..5526000e1 100644
--- a/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_embedded_null/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot.js b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot.js
index 148ee4b27..148ee4b27 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot.js
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js
index b17c592ee..b17c592ee 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert8.db b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert8.db
index 87abcf35a..87abcf35a 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert8.db
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert8.db
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert9.db b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert9.db
index b4567566d..b4567566d 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert9.db
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/cert9.db
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key3.db b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key3.db
index 37241a743..37241a743 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key3.db
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key3.db
diff --git a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key4.db b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key4.db
index ed8747112..ed8747112 100644
--- a/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key4.db
+++ b/system/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload/key4.db
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage.js b/system/security/manager/ssl/tests/unit/test_cert_keyUsage.js
index dd6fc4274..dd6fc4274 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage.js
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
index 68cfd91f3..68cfd91f3 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem.certspec
index 2ca523c74..2ca523c74 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
index b2f21337e..b2f21337e 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem.certspec
index 26e0158eb..26e0158eb 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
index 42b620d4e..42b620d4e 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem.certspec
index d32e6a649..d32e6a649 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
index bdf9b0969..bdf9b0969 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem.certspec
index 0bb2721a3..0bb2721a3 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
index 07af0afad..07af0afad 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem.certspec
index 567ab0ce2..567ab0ce2 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
index c5fafc299..c5fafc299 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem.certspec
index c48ef6612..c48ef6612 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
index 7f6c21909..7f6c21909 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem.certspec
index c495ca6d0..c495ca6d0 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
index 6a3e4ee0e..6a3e4ee0e 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem.certspec
index 23ddd0eb8..23ddd0eb8 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
index 0f4446e8c..0f4446e8c 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem.certspec
index a5a2d62a7..a5a2d62a7 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
index 5cb293924..5cb293924 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem.certspec
index 08154a53e..08154a53e 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
index 75e64e3b3..75e64e3b3 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem.certspec
index 9bdcf4b7b..9bdcf4b7b 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
index 7707ffa36..7707ffa36 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem.certspec
index a2383ecfd..a2383ecfd 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
index 37a0b68b1..37a0b68b1 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem.certspec
index 6d2e67296..6d2e67296 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
index bc192ff9c..bc192ff9c 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem.certspec
index 3cba2f0d8..3cba2f0d8 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
index 340de5e33..340de5e33 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem.certspec
index c850725a6..c850725a6 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build
index e5e2f29db..e5e2f29db 100644
--- a/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_keyUsage/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_override_bits_mismatches.js b/system/security/manager/ssl/tests/unit/test_cert_override_bits_mismatches.js
index 83b4fdbc6..83b4fdbc6 100644
--- a/security/manager/ssl/tests/unit/test_cert_override_bits_mismatches.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_override_bits_mismatches.js
diff --git a/security/manager/ssl/tests/unit/test_cert_overrides.js b/system/security/manager/ssl/tests/unit/test_cert_overrides.js
index 038ca814f..038ca814f 100644
--- a/security/manager/ssl/tests/unit/test_cert_overrides.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_overrides.js
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1.js b/system/security/manager/ssl/tests/unit/test_cert_sha1.js
index f0d7c570a..f0d7c570a 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1.js
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
index 3eb86849d..3eb86849d 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem.certspec
index 7e65e9ee3..7e65e9ee3 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
index 19d8f096a..19d8f096a 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem.certspec
index 76834f844..76834f844 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-post.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
index 2d1ff2d2e..2d1ff2d2e 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem.certspec
index 1e8bb35b3..1e8bb35b3 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-post_int-pre.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
index a992d8272..a992d8272 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem.certspec
index 0f4a6ec25..0f4a6ec25 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/ee-pre_int-pre.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
index c1a9ab2fa..c1a9ab2fa 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem.certspec
index 50156c9f6..50156c9f6 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-post.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
index 41170f837..41170f837 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem.certspec
index 9f0a59ee9..9f0a59ee9 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/int-pre.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_sha1/moz.build b/system/security/manager/ssl/tests/unit/test_cert_sha1/moz.build
index 572e433e1..572e433e1 100644
--- a/security/manager/ssl/tests/unit/test_cert_sha1/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_sha1/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures.js b/system/security/manager/ssl/tests/unit/test_cert_signatures.js
index 8be89c8a2..8be89c8a2 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures.js
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
index d69aa25b6..d69aa25b6 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem.certspec
index 5890d2db6..5890d2db6 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
index efa00a41b..efa00a41b 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem.certspec
index 0701c23c1..0701c23c1 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
index 17c1eddac..17c1eddac 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem.certspec
index 4e25ddcf9..4e25ddcf9 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
index 85a3256bf..85a3256bf 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem.certspec
index b974a0a0a..b974a0a0a 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
index 373e3227f..373e3227f 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem.certspec
index 386ab95f7..386ab95f7 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
index b11cfd53c..b11cfd53c 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem.certspec
index b8f7993be..b8f7993be 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
index f01885f4b..f01885f4b 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem.certspec
index a86d28b44..a86d28b44 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
index 5893cf191..5893cf191 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem.certspec
index e002a1569..e002a1569 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_signatures/moz.build b/system/security/manager/ssl/tests/unit/test_cert_signatures/moz.build
index 2494eb4a7..2494eb4a7 100644
--- a/security/manager/ssl/tests/unit/test_cert_signatures/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_signatures/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_trust.js b/system/security/manager/ssl/tests/unit/test_cert_trust.js
index bf081f1bd..bf081f1bd 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust.js
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/ca.pem b/system/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_trust/ca.pem.certspec
index d809dbd63..d809dbd63 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/ee.pem b/system/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
index 91c1ffcab..91c1ffcab 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_trust/ee.pem.certspec
index 9666c1806..9666c1806 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/int.pem b/system/security/manager/ssl/tests/unit/test_cert_trust/int.pem
index fd60e5fe2..fd60e5fe2 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/int.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/int.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/int.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_trust/int.pem.certspec
index a7f6d8141..a7f6d8141 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_trust/moz.build b/system/security/manager/ssl/tests/unit/test_cert_trust/moz.build
index 3d7479416..3d7479416 100644
--- a/security/manager/ssl/tests/unit/test_cert_trust/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_trust/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_version.js b/system/security/manager/ssl/tests/unit/test_cert_version.js
index 063bcb1cc..063bcb1cc 100644
--- a/security/manager/ssl/tests/unit/test_cert_version.js
+++ b/system/security/manager/ssl/tests/unit/test_cert_version.js
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ca.pem
index d5d688220..d5d688220 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ca.pem.certspec
index 8689ef9ea..8689ef9ea 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
index 2b606ba68..2b606ba68 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem.certspec
index 4570e6e3f..4570e6e3f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
index 8fccea824..8fccea824 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem.certspec
index f4257841f..f4257841f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
index c65444481..c65444481 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem.certspec
index 48fe9e541..48fe9e541 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
index 2d16032b3..2d16032b3 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem.certspec
index f714725d2..f714725d2 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
index 224e4f075..224e4f075 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem.certspec
index db7228881..db7228881 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
index b54cfd23c..b54cfd23c 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem.certspec
index cc304ab87..cc304ab87 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
index 0db92cab3..0db92cab3 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem.certspec
index 6f69c3574..6f69c3574 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
index 768871d74..768871d74 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem.certspec
index 4a9de0635..4a9de0635 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
index 2be86fcdb..2be86fcdb 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem.certspec
index 9d385900f..9d385900f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
index e766ae395..e766ae395 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem.certspec
index 1f44c1dd2..1f44c1dd2 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
index 627429ed7..627429ed7 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem.certspec
index e9659153e..e9659153e 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
index 1852ea6ce..1852ea6ce 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem.certspec
index 19229ba76..19229ba76 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
index 1347bc1ae..1347bc1ae 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem.certspec
index 6a7dc5c43..6a7dc5c43 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
index c42913f1f..c42913f1f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem.certspec
index 639f83d66..639f83d66 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
index 39cf67e24..39cf67e24 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem.certspec
index d704f3086..d704f3086 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
index 5147e4587..5147e4587 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem.certspec
index 5d3a65e65..5d3a65e65 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
index 4f7042bcf..4f7042bcf 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem.certspec
index 591a16aca..591a16aca 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
index 0612422f0..0612422f0 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem.certspec
index 7f99393cf..7f99393cf 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
index ab530840e..ab530840e 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem.certspec
index 13af934f2..13af934f2 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
index 4982b6454..4982b6454 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem.certspec
index 8539715a0..8539715a0 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
index 65f4c3697..65f4c3697 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem.certspec
index a65e41cea..a65e41cea 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
index 9405db2dd..9405db2dd 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem.certspec
index 35a3a9ff3..35a3a9ff3 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
index 767219577..767219577 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem.certspec
index 7627d3a8a..7627d3a8a 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
index 30ee60821..30ee60821 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem.certspec
index a78033753..a78033753 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/generate.py b/system/security/manager/ssl/tests/unit/test_cert_version/generate.py
index b99cbefe2..b99cbefe2 100755..100644
--- a/security/manager/ssl/tests/unit/test_cert_version/generate.py
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/generate.py
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
index 26e57b926..26e57b926 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem.certspec
index 77f3ae914..77f3ae914 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
index 59ffb040f..59ffb040f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem.certspec
index 2a366535b..2a366535b 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
index 4f11b699b..4f11b699b 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem.certspec
index 63bf6ed73..63bf6ed73 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
index ee4285cbf..ee4285cbf 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem.certspec
index ca1bf67a7..ca1bf67a7 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
index f4159d5aa..f4159d5aa 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem.certspec
index fc28ff150..fc28ff150 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
index 93d83a2b6..93d83a2b6 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem.certspec
index 2d3fe59ff..2d3fe59ff 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
index a27e8058d..a27e8058d 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem.certspec
index 56fcb21a0..56fcb21a0 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
index a7cadbebd..a7cadbebd 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem.certspec
index a2def8d32..a2def8d32 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
index 9e342a0d7..9e342a0d7 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem.certspec
index b336397ab..b336397ab 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
index a687058bc..a687058bc 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem.certspec
index 12b94e63a..12b94e63a 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
index ed8fd32d4..ed8fd32d4 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem.certspec
index 43a04f70f..43a04f70f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
index 037046a8b..037046a8b 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem.certspec
index 4970d1e94..4970d1e94 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/moz.build b/system/security/manager/ssl/tests/unit/test_cert_version/moz.build
index 7c7dcdfbc..7c7dcdfbc 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/moz.build
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
index 46f82cebf..46f82cebf 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem.certspec
index 731396f03..731396f03 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
index 5f9d30fba..5f9d30fba 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem.certspec
index 20d716d49..20d716d49 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
index a117460d8..a117460d8 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem.certspec
index 58d2f0d7f..58d2f0d7f 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
index c23ff6607..c23ff6607 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem.certspec
index 8dbb3a65a..8dbb3a65a 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
index 2ba60c464..2ba60c464 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem.certspec
index 2b8f4bcc5..2b8f4bcc5 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem
index 1cd6979a6..1cd6979a6 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem.certspec
index 7656115a8..7656115a8 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem
index ea4a18024..ea4a18024 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem.certspec
index df822e99b..df822e99b 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem
index f612c29fd..f612c29fd 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem.certspec
index 0b2b57557..0b2b57557 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem
index 849fbcda2..849fbcda2 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem.certspec
index 96314e51a..96314e51a 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem
index 01e952442..01e952442 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem.certspec
index 54269184e..54269184e 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem
index b876791f4..b876791f4 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem.certspec
index 3d6533531..3d6533531 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem
index 317319c72..317319c72 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem
diff --git a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem.certspec b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem.certspec
index d02e04de5..d02e04de5 100644
--- a/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids.js b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids.js
index 2c244aad7..2c244aad7 100644
--- a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids.js
+++ b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids.js
diff --git a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack2b.pem b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack2b.pem
index 8adcf2ac1..8adcf2ac1 100644
--- a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack2b.pem
+++ b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack2b.pem
diff --git a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack7.pem b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack7.pem
index 778e7aced..778e7aced 100644
--- a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack7.pem
+++ b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-attack7.pem
diff --git a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-pk10oflo.pem b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-pk10oflo.pem
index 7daef524b..7daef524b 100644
--- a/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-pk10oflo.pem
+++ b/system/security/manager/ssl/tests/unit/test_certviewer_invalid_oids/bug483440-pk10oflo.pem
diff --git a/security/manager/ssl/tests/unit/test_constructX509FromBase64.js b/system/security/manager/ssl/tests/unit/test_constructX509FromBase64.js
index d44e249c2..d44e249c2 100644
--- a/security/manager/ssl/tests/unit/test_constructX509FromBase64.js
+++ b/system/security/manager/ssl/tests/unit/test_constructX509FromBase64.js
diff --git a/security/manager/ssl/tests/unit/test_content_signing.js b/system/security/manager/ssl/tests/unit/test_content_signing.js
index 99ea33a3a..99ea33a3a 100644
--- a/security/manager/ssl/tests/unit/test_content_signing.js
+++ b/system/security/manager/ssl/tests/unit/test_content_signing.js
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem
index f58505cd3..f58505cd3 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem.certspec
index 4134a73c6..4134a73c6 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem
index fbd0d7980..fbd0d7980 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem.certspec
index b69737823..b69737823 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem
index 999885dcf..999885dcf 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem.certspec
index 2034a7299..2034a7299 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem
index 725374c14..725374c14 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem.certspec
index fc0874be0..fc0874be0 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem
index 91f5e2dea..91f5e2dea 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem.certspec
index f5cb96226..f5cb96226 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem
index 7bac9e8c7..7bac9e8c7 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem.certspec
index 44fa64518..44fa64518 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem
index b1ac172b1..b1ac172b1 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem
diff --git a/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem.certspec b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem.certspec
index f5e387b0c..f5e387b0c 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_content_signing/moz.build b/system/security/manager/ssl/tests/unit/test_content_signing/moz.build
index 6422117a4..6422117a4 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/moz.build
diff --git a/security/manager/ssl/tests/unit/test_content_signing/pysign.py b/system/security/manager/ssl/tests/unit/test_content_signing/pysign.py
index c68c45b52..c68c45b52 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/pysign.py
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/pysign.py
diff --git a/security/manager/ssl/tests/unit/test_content_signing/test.txt b/system/security/manager/ssl/tests/unit/test_content_signing/test.txt
index 2daac1cb0..2daac1cb0 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/test.txt
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/test.txt
diff --git a/security/manager/ssl/tests/unit/test_content_signing/test.txt.signature b/system/security/manager/ssl/tests/unit/test_content_signing/test.txt.signature
index e61398147..e61398147 100644
--- a/security/manager/ssl/tests/unit/test_content_signing/test.txt.signature
+++ b/system/security/manager/ssl/tests/unit/test_content_signing/test.txt.signature
diff --git a/security/manager/ssl/tests/unit/test_datasignatureverifier.js b/system/security/manager/ssl/tests/unit/test_datasignatureverifier.js
index 0479c4d3f..0479c4d3f 100644
--- a/security/manager/ssl/tests/unit/test_datasignatureverifier.js
+++ b/system/security/manager/ssl/tests/unit/test_datasignatureverifier.js
diff --git a/security/manager/ssl/tests/unit/test_der.js b/system/security/manager/ssl/tests/unit/test_der.js
index 674e939d9..674e939d9 100644
--- a/security/manager/ssl/tests/unit/test_der.js
+++ b/system/security/manager/ssl/tests/unit/test_der.js
diff --git a/security/manager/ssl/tests/unit/test_enterprise_roots.js b/system/security/manager/ssl/tests/unit/test_enterprise_roots.js
index de1b3a529..de1b3a529 100644
--- a/security/manager/ssl/tests/unit/test_enterprise_roots.js
+++ b/system/security/manager/ssl/tests/unit/test_enterprise_roots.js
diff --git a/security/manager/ssl/tests/unit/test_ev_certs.js b/system/security/manager/ssl/tests/unit/test_ev_certs.js
index d4aabd888..d4aabd888 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs.js
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs.js
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem
index 16c8578ba..16c8578ba 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem.certspec
index a9175c32e..a9175c32e 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem
index bcab0c65a..bcab0c65a 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem.certspec
index c49f6c4bc..c49f6c4bc 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem
index d68714416..d68714416 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem.certspec
index 1c643c2f9..1c643c2f9 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem
index b4a54cebc..b4a54cebc 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem.certspec
index 5f5adacc7..5f5adacc7 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem
index 5bbfba9e0..5bbfba9e0 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
index c72237e45..c72237e45 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem
index 95c8be6cd..95c8be6cd 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem.certspec
index 92ebdb37f..92ebdb37f 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem
index 1ccb37723..1ccb37723 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem.certspec
index 36f80e017..36f80e017 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem
index 7f6ac062f..7f6ac062f 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem.certspec
index 79ae7ae80..79ae7ae80 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem
index d0ccbac0a..d0ccbac0a 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem.certspec
index 86fd9aca3..86fd9aca3 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem
index e377615fa..e377615fa 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem.certspec
index 343307164..343307164 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/evroot.key b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.key
index a756a0705..a756a0705 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/evroot.key
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.key
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/evroot.key.keyspec b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.key.keyspec
index 1a3d76a55..1a3d76a55 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/evroot.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem
index cd2fd7ed8..cd2fd7ed8 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem.certspec
index 3121f3486..3121f3486 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/moz.build b/system/security/manager/ssl/tests/unit/test_ev_certs/moz.build
index a688ffa07..a688ffa07 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/moz.build
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem
index bdb27bc87..bdb27bc87 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem.certspec
index ece1cf816..ece1cf816 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem
index 77f66fa60..77f66fa60 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem.certspec
index 5eb952a9a..5eb952a9a 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem
index 19b8e6bd1..19b8e6bd1 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem.certspec
index 623057e9e..623057e9e 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem
index cd496900b..cd496900b 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem.certspec
index 548241de3..548241de3 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem
index ffb8a6d3b..ffb8a6d3b 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem.certspec
index 9895732b1..9895732b1 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem
index 2223a424c..2223a424c 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem.certspec
index 5ce035ae1..5ce035ae1 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem
index b7560f2dc..b7560f2dc 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem.certspec
index 7b61447a8..7b61447a8 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem
index 8bfe3c24c..8bfe3c24c 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem.certspec
index 31e3e69e5..31e3e69e5 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem
index 105064c6d..105064c6d 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem.certspec
index a2b523073..a2b523073 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem
index 1fe162bc7..1fe162bc7 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem.certspec
index edac2fc1a..edac2fc1a 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem
index ce757742d..ce757742d 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem.certspec
index 68dfd0057..68dfd0057 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem
index ab86be7d9..ab86be7d9 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem.certspec
index affbd8745..affbd8745 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem
index e508339df..e508339df 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem.certspec
index 11630b4b4..11630b4b4 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem
index d130202d7..d130202d7 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
index bd0f955ad..bd0f955ad 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem
index 60f9e2855..60f9e2855 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem.certspec
index 37d4d133a..37d4d133a 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem
index 67e14e875..67e14e875 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem.certspec
index a9d62c65e..a9d62c65e 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key.keyspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem
index cbfd53b47..cbfd53b47 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem
diff --git a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem.certspec
index 53534eb52..53534eb52 100644
--- a/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_forget_about_site_security_headers.js b/system/security/manager/ssl/tests/unit/test_forget_about_site_security_headers.js
index c075428ee..c075428ee 100644
--- a/security/manager/ssl/tests/unit/test_forget_about_site_security_headers.js
+++ b/system/security/manager/ssl/tests/unit/test_forget_about_site_security_headers.js
diff --git a/security/manager/ssl/tests/unit/test_getchain.js b/system/security/manager/ssl/tests/unit/test_getchain.js
index 2851c3a70..2851c3a70 100644
--- a/security/manager/ssl/tests/unit/test_getchain.js
+++ b/system/security/manager/ssl/tests/unit/test_getchain.js
diff --git a/security/manager/ssl/tests/unit/test_getchain/ca-1.pem b/system/security/manager/ssl/tests/unit/test_getchain/ca-1.pem
index a3dcb268c..a3dcb268c 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ca-1.pem
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ca-1.pem
diff --git a/security/manager/ssl/tests/unit/test_getchain/ca-1.pem.certspec b/system/security/manager/ssl/tests/unit/test_getchain/ca-1.pem.certspec
index 6062931cd..6062931cd 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ca-1.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ca-1.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_getchain/ca-2.pem b/system/security/manager/ssl/tests/unit/test_getchain/ca-2.pem
index fab9f209e..fab9f209e 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ca-2.pem
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ca-2.pem
diff --git a/security/manager/ssl/tests/unit/test_getchain/ca-2.pem.certspec b/system/security/manager/ssl/tests/unit/test_getchain/ca-2.pem.certspec
index bb599046e..bb599046e 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ca-2.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ca-2.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_getchain/ee.pem b/system/security/manager/ssl/tests/unit/test_getchain/ee.pem
index 237e36bf0..237e36bf0 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ee.pem
diff --git a/security/manager/ssl/tests/unit/test_getchain/ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_getchain/ee.pem.certspec
index 34e99782b..34e99782b 100644
--- a/security/manager/ssl/tests/unit/test_getchain/ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_getchain/ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_getchain/moz.build b/system/security/manager/ssl/tests/unit/test_getchain/moz.build
index 90f014999..90f014999 100644
--- a/security/manager/ssl/tests/unit/test_getchain/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_getchain/moz.build
diff --git a/security/manager/ssl/tests/unit/test_hash_algorithms.js b/system/security/manager/ssl/tests/unit/test_hash_algorithms.js
index 17ccd0781..17ccd0781 100644
--- a/security/manager/ssl/tests/unit/test_hash_algorithms.js
+++ b/system/security/manager/ssl/tests/unit/test_hash_algorithms.js
diff --git a/security/manager/ssl/tests/unit/test_hash_algorithms_wrap.js b/system/security/manager/ssl/tests/unit/test_hash_algorithms_wrap.js
index f2b7016c0..f2b7016c0 100644
--- a/security/manager/ssl/tests/unit/test_hash_algorithms_wrap.js
+++ b/system/security/manager/ssl/tests/unit/test_hash_algorithms_wrap.js
diff --git a/security/manager/ssl/tests/unit/test_hmac.js b/system/security/manager/ssl/tests/unit/test_hmac.js
index 7adc46190..7adc46190 100644
--- a/security/manager/ssl/tests/unit/test_hmac.js
+++ b/system/security/manager/ssl/tests/unit/test_hmac.js
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints.js b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints.js
index 5ebc1546b..5ebc1546b 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints.js
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints.js
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem
index f9bc514d4..f9bc514d4 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem.certspec
index eb7c4b4be..eb7c4b4be 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem
index 7204416fd..7204416fd 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem.certspec
index 390adf234..390adf234 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem
index 0d39a7832..0d39a7832 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem.certspec
index 32bb6c248..32bb6c248 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem
index d60e8e8fc..d60e8e8fc 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem.certspec
index 9e0fb65fd..9e0fb65fd 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem
index 10068137f..10068137f 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem.certspec
index f00b4d159..f00b4d159 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem
index 23904452a..23904452a 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem.certspec
index df85342d9..df85342d9 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem
index b284989f9..b284989f9 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem.certspec
index c5279046d..c5279046d 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem
index 3169edf91..3169edf91 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem.certspec
index 92ee3cc6d..92ee3cc6d 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem
index 1037a03fa..1037a03fa 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem.certspec
index c14889671..c14889671 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem
index 5a959c953..5a959c953 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem.certspec
index a95b0dc26..a95b0dc26 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem
index 97708b4b9..97708b4b9 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem.certspec
index 89a66b9f9..89a66b9f9 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem
index ba523f64d..ba523f64d 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem.certspec
index 43e83a336..43e83a336 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem
index 87c9e7783..87c9e7783 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem.certspec
index f6525449b..f6525449b 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem
index f2550274a..f2550274a 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem.certspec
index 2d324508d..2d324508d 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem
index be9eeba00..be9eeba00 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem.certspec
index 39785d8a4..39785d8a4 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem
index a7e980c85..a7e980c85 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem.certspec
index 9fdb2a248..9fdb2a248 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem
index d8e06a572..d8e06a572 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem.certspec
index 64f54b044..64f54b044 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem
index 76930d04d..76930d04d 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem.certspec
index c99626bd5..c99626bd5 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem
index 53437b1de..53437b1de 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem.certspec
index 306a218db..306a218db 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem
index 6cd516927..6cd516927 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem.certspec
index 1482b627c..1482b627c 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem
index 3be0c2916..3be0c2916 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem.certspec
index 3161680b1..3161680b1 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem
index 84cd61105..84cd61105 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem.certspec
index d7f9b0387..d7f9b0387 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem
index 34818f172..34818f172 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem.certspec b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem.certspec
index 84314bfa4..84314bfa4 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build
index dee3c070e..dee3c070e 100644
--- a/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/moz.build
diff --git a/security/manager/ssl/tests/unit/test_js_cert_override_service.js b/system/security/manager/ssl/tests/unit/test_js_cert_override_service.js
index 8b6e9f69b..8b6e9f69b 100644
--- a/security/manager/ssl/tests/unit/test_js_cert_override_service.js
+++ b/system/security/manager/ssl/tests/unit/test_js_cert_override_service.js
diff --git a/security/manager/ssl/tests/unit/test_keysize.js b/system/security/manager/ssl/tests/unit/test_keysize.js
index 3a8e28e87..3a8e28e87 100644
--- a/security/manager/ssl/tests/unit/test_keysize.js
+++ b/system/security/manager/ssl/tests/unit/test_keysize.js
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem
index 020e46819..020e46819 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem.certspec
index 7b86ef786..7b86ef786 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem
index 7c36379fe..7c36379fe 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem.certspec
index 326d665dc..326d665dc 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem
index 6020cf3ae..6020cf3ae 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem.certspec
index c44a089ed..c44a089ed 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem
index 020b749b0..020b749b0 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem.certspec
index a6ee408ec..a6ee408ec 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem
index 18adf9859..18adf9859 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
index 87d2f6733..87d2f6733 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem
index 04b630f61..04b630f61 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
index 1aadce076..1aadce076 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem
index b90be0ce3..b90be0ce3 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
index ba999e8f1..ba999e8f1 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem
index 024ca3e4c..024ca3e4c 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
index 1e2e0a375..1e2e0a375 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem
index f8e48209c..f8e48209c 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
index bd7bc770c..bd7bc770c 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem
index 907017269..907017269 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
index fe7b7f748..fe7b7f748 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem
index 37060f122..37060f122 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
index aefffd981..aefffd981 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem
index c2d227243..c2d227243 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
index 615818d08..615818d08 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem
index 5f5416365..5f5416365 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
index b2ae9d0c8..b2ae9d0c8 100644
--- a/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem
index 4e3b0d034..4e3b0d034 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem.certspec
index c6e77116b..c6e77116b 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem
index 261ca6448..261ca6448 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
index 27728ca37..27728ca37 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem
index eff1ee721..eff1ee721 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem.certspec
index fafb393bf..fafb393bf 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem
index 3c6264488..3c6264488 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem.certspec
index 66891f979..66891f979 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem
index cfd1fc33a..cfd1fc33a 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
index 89d77d3b8..89d77d3b8 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem
index 5cda1057d..5cda1057d 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
index 44a65ef5a..44a65ef5a 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem
index 2d04da2e0..2d04da2e0 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
index 66ebc1b93..66ebc1b93 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem
index dba78878f..dba78878f 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
index c7e190ab0..c7e190ab0 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem
index b415487ef..b415487ef 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
index 6854d2187..6854d2187 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem
index c2958dc6d..c2958dc6d 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
index de8e85198..de8e85198 100644
--- a/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/moz.build b/system/security/manager/ssl/tests/unit/test_keysize/moz.build
index 634ce7a83..634ce7a83 100644
--- a/security/manager/ssl/tests/unit/test_keysize/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_keysize/moz.build
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem
index 0a72087f1..0a72087f1 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem.certspec
index b0b5ba8e5..b0b5ba8e5 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem
index 4057c0d02..4057c0d02 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem.certspec
index 09cd420f7..09cd420f7 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem
index f08030ecc..f08030ecc 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem.certspec
index cebc2f8e6..cebc2f8e6 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem
index afc387bf1..afc387bf1 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem.certspec
index 31370f6f7..31370f6f7 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem
index 19cbdc712..19cbdc712 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem.certspec
index c78aa61bb..c78aa61bb 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem
index 2417685dd..2417685dd 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
index 4447fc4b4..4447fc4b4 100644
--- a/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev.js b/system/security/manager/ssl/tests/unit/test_keysize_ev.js
index b6b4ccade..b6b4ccade 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev.js
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev.js
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem
index 1e231157c..1e231157c 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem.certspec
index e64c651bc..e64c651bc 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem
index 4c66b2252..4c66b2252 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem.certspec
index 0b7bfd426..0b7bfd426 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem
index 3b579102a..3b579102a 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
index a36acf887..a36acf887 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem
index 47d86baf5..47d86baf5 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem.certspec
index 0b34be6db..0b34be6db 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem
index db935fd24..db935fd24 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem.certspec
index 80be71174..80be71174 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key
index e9010b691..e9010b691 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key.keyspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key.keyspec
index f488e73a9..f488e73a9 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem
index 3de3f13d0..3de3f13d0 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
index 5bc5674b2..5bc5674b2 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem
index 28ef9a63f..28ef9a63f 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem.certspec
index a0cb6250d..a0cb6250d 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key.keyspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key
index bb8708bfd..bb8708bfd 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key.keyspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key.keyspec
index a85e16858..a85e16858 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem
index e8640696e..e8640696e 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem.certspec
index fd1ade8de..fd1ade8de 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/ev_root_rsa_2040.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key
index a756a0705..a756a0705 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key.keyspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key.keyspec
index 1a3d76a55..1a3d76a55 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem
index cd2fd7ed8..cd2fd7ed8 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem.certspec
index 3121f3486..3121f3486 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_keysize_ev/moz.build b/system/security/manager/ssl/tests/unit/test_keysize_ev/moz.build
index 0908698d4..0908698d4 100644
--- a/security/manager/ssl/tests/unit/test_keysize_ev/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_keysize_ev/moz.build
diff --git a/security/manager/ssl/tests/unit/test_local_cert.js b/system/security/manager/ssl/tests/unit/test_local_cert.js
index 937c0432b..937c0432b 100644
--- a/security/manager/ssl/tests/unit/test_local_cert.js
+++ b/system/security/manager/ssl/tests/unit/test_local_cert.js
diff --git a/security/manager/ssl/tests/unit/test_logoutAndTeardown.js b/system/security/manager/ssl/tests/unit/test_logoutAndTeardown.js
index 2bf8855fe..2bf8855fe 100644
--- a/security/manager/ssl/tests/unit/test_logoutAndTeardown.js
+++ b/system/security/manager/ssl/tests/unit/test_logoutAndTeardown.js
diff --git a/security/manager/ssl/tests/unit/test_name_constraints.js b/system/security/manager/ssl/tests/unit/test_name_constraints.js
index e75c89740..e75c89740 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints.js
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints.js
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem
index 9eb316736..9eb316736 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem.certspec
index 1a02a0cc1..1a02a0cc1 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem
index 044a8205d..044a8205d 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem.certspec
index eabee87e8..eabee87e8 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem
index a82688fd8..a82688fd8 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem.certspec
index 1cc3c1d81..1cc3c1d81 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem
index 2d8fc903a..2d8fc903a 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem.certspec
index 5d53706bc..5d53706bc 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem
index d0442e004..d0442e004 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem.certspec
index 904ca6595..904ca6595 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem
index fad336b1c..fad336b1c 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem.certspec
index 46630c4a1..46630c4a1 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem
index 7e366f8ca..7e366f8ca 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem.certspec
index 6a24090e5..6a24090e5 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem
index 0b65d0f3d..0b65d0f3d 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem.certspec
index 0926ce477..0926ce477 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem b/system/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem
index 4f12c9a61..4f12c9a61 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem.certspec b/system/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem.certspec
index 87e2cf8a5..87e2cf8a5 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_name_constraints/moz.build b/system/security/manager/ssl/tests/unit/test_name_constraints/moz.build
index 1a4557b99..1a4557b99 100644
--- a/security/manager/ssl/tests/unit/test_name_constraints/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_name_constraints/moz.build
diff --git a/security/manager/ssl/tests/unit/test_nsCertType.js b/system/security/manager/ssl/tests/unit/test_nsCertType.js
index 2e378541d..2e378541d 100644
--- a/security/manager/ssl/tests/unit/test_nsCertType.js
+++ b/system/security/manager/ssl/tests/unit/test_nsCertType.js
diff --git a/security/manager/ssl/tests/unit/test_nsIX509CertValidity.js b/system/security/manager/ssl/tests/unit/test_nsIX509CertValidity.js
index f35f5d97b..f35f5d97b 100644
--- a/security/manager/ssl/tests/unit/test_nsIX509CertValidity.js
+++ b/system/security/manager/ssl/tests/unit/test_nsIX509CertValidity.js
diff --git a/security/manager/ssl/tests/unit/test_nsIX509Cert_utf8.js b/system/security/manager/ssl/tests/unit/test_nsIX509Cert_utf8.js
index b4b0d6f37..b4b0d6f37 100644
--- a/security/manager/ssl/tests/unit/test_nsIX509Cert_utf8.js
+++ b/system/security/manager/ssl/tests/unit/test_nsIX509Cert_utf8.js
diff --git a/security/manager/ssl/tests/unit/test_nss_shutdown.js b/system/security/manager/ssl/tests/unit/test_nss_shutdown.js
index 0c467cbd4..0c467cbd4 100644
--- a/security/manager/ssl/tests/unit/test_nss_shutdown.js
+++ b/system/security/manager/ssl/tests/unit/test_nss_shutdown.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_caching.js b/system/security/manager/ssl/tests/unit/test_ocsp_caching.js
index d0897fccd..d0897fccd 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_caching.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_caching.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_enabled_pref.js b/system/security/manager/ssl/tests/unit/test_ocsp_enabled_pref.js
index ba648b9e6..ba648b9e6 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_enabled_pref.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_enabled_pref.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
index de89a4131..de89a4131 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem
index 67961e695..67961e695 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec
index d3a3f86ef..d3a3f86ef 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec
index 6660f5d47..6660f5d47 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key.keyspec b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem
index fd60e5fe2..fd60e5fe2 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec
index ebb4c376d..ebb4c376d 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build
index b48899eec..b48899eec 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build
diff --git a/security/manager/ssl/tests/unit/test_ocsp_must_staple.js b/system/security/manager/ssl/tests/unit/test_ocsp_must_staple.js
index ece1757ac..ece1757ac 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_must_staple.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_must_staple.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_no_hsts_upgrade.js b/system/security/manager/ssl/tests/unit/test_ocsp_no_hsts_upgrade.js
index 62ff1ba25..62ff1ba25 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_no_hsts_upgrade.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_no_hsts_upgrade.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_required.js b/system/security/manager/ssl/tests/unit/test_ocsp_required.js
index 81b8677bc..81b8677bc 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_required.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_required.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_stapling.js b/system/security/manager/ssl/tests/unit/test_ocsp_stapling.js
index 36c8aeaaf..36c8aeaaf 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_stapling.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_stapling.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_stapling_expired.js b/system/security/manager/ssl/tests/unit/test_ocsp_stapling_expired.js
index b49be85e7..b49be85e7 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_stapling_expired.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_stapling_expired.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_stapling_with_intermediate.js b/system/security/manager/ssl/tests/unit/test_ocsp_stapling_with_intermediate.js
index 21676f1d5..21676f1d5 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_stapling_with_intermediate.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_stapling_with_intermediate.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_timeout.js b/system/security/manager/ssl/tests/unit/test_ocsp_timeout.js
index 1c4803371..1c4803371 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_timeout.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_timeout.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url.js b/system/security/manager/ssl/tests/unit/test_ocsp_url.js
index 799c934d0..799c934d0 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url.js
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url.js
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem
index 861b9aafa..861b9aafa 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem.certspec
index 12cc07279..12cc07279 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem
index 1a18e2bf0..1a18e2bf0 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem.certspec
index d809dbd63..d809dbd63 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem
index 94d4ba65e..94d4ba65e 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem.certspec
index e8959653f..e8959653f 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem
index 4ddeaa0e5..4ddeaa0e5 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem.certspec
index 9f50a7d79..9f50a7d79 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem
index 35b5b0fbf..35b5b0fbf 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem.certspec
index 10b1504b2..10b1504b2 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem
index 3229f8b6b..3229f8b6b 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem.certspec
index 891005bf5..891005bf5 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/int.key b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/int.key
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.key
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/int.key.keyspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/int.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/int.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.pem
index fd60e5fe2..fd60e5fe2 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/int.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/int.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.pem.certspec
index a7f6d8141..a7f6d8141 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/int.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/int.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/moz.build b/system/security/manager/ssl/tests/unit/test_ocsp_url/moz.build
index fdfef8e36..fdfef8e36 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/moz.build
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem
index d5da47063..d5da47063 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem.certspec
index fce6d4384..fce6d4384 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem
index e1dd6e432..e1dd6e432 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem.certspec
index 4ac76e7eb..4ac76e7eb 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem
index 0a2b18870..0a2b18870 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem.certspec
index 497bb2879..497bb2879 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem
index cee29837d..cee29837d 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem.certspec
index 42a555e41..42a555e41 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem
index 58d799cb1..58d799cb1 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem.certspec
index a82196a6d..a82196a6d 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem
index 1ab089a8c..1ab089a8c 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem.certspec
index 008945539..008945539 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem b/system/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem
index aead46e41..aead46e41 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem
diff --git a/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem.certspec b/system/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem.certspec
index 337e67e5f..337e67e5f 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_onecrl/moz.build b/system/security/manager/ssl/tests/unit/test_onecrl/moz.build
index 339f92211..339f92211 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/moz.build
diff --git a/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem b/system/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem
index c48cd895b..c48cd895b 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem.certspec
index 8b20f03f5..8b20f03f5 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_onecrl/sample_revocations.txt b/system/security/manager/ssl/tests/unit/test_onecrl/sample_revocations.txt
index e8d9db746..e8d9db746 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/sample_revocations.txt
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/sample_revocations.txt
diff --git a/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem b/system/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem
index 34d2cf669..34d2cf669 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem
diff --git a/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem.certspec b/system/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem.certspec
index 24792d540..24792d540 100644
--- a/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_password_prompt.js b/system/security/manager/ssl/tests/unit/test_password_prompt.js
index cdf4227cb..cdf4227cb 100644
--- a/security/manager/ssl/tests/unit/test_password_prompt.js
+++ b/system/security/manager/ssl/tests/unit/test_password_prompt.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_insert_remove.js b/system/security/manager/ssl/tests/unit/test_pkcs11_insert_remove.js
index b0592906c..b0592906c 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_insert_remove.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_insert_remove.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_module.js b/system/security/manager/ssl/tests/unit/test_pkcs11_module.js
index f00143187..f00143187 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_module.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_module.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_no_events_after_removal.js b/system/security/manager/ssl/tests/unit/test_pkcs11_no_events_after_removal.js
index f31d1d494..f31d1d494 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_no_events_after_removal.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_no_events_after_removal.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js b/system/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js
index d64d194e4..d64d194e4 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_slot.js b/system/security/manager/ssl/tests/unit/test_pkcs11_slot.js
index 8aebf0439..8aebf0439 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_slot.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_slot.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_token.js b/system/security/manager/ssl/tests/unit/test_pkcs11_token.js
index 69b2cb384..69b2cb384 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_token.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_token.js
diff --git a/security/manager/ssl/tests/unit/test_pkcs11_tokenDB.js b/system/security/manager/ssl/tests/unit/test_pkcs11_tokenDB.js
index ac382ab82..ac382ab82 100644
--- a/security/manager/ssl/tests/unit/test_pkcs11_tokenDB.js
+++ b/system/security/manager/ssl/tests/unit/test_pkcs11_tokenDB.js
diff --git a/security/manager/ssl/tests/unit/test_sdr.js b/system/security/manager/ssl/tests/unit/test_sdr.js
index 3258ec901..3258ec901 100644
--- a/security/manager/ssl/tests/unit/test_sdr.js
+++ b/system/security/manager/ssl/tests/unit/test_sdr.js
diff --git a/security/manager/ssl/tests/unit/test_session_resumption.js b/system/security/manager/ssl/tests/unit/test_session_resumption.js
index eea6b5f54..eea6b5f54 100644
--- a/security/manager/ssl/tests/unit/test_session_resumption.js
+++ b/system/security/manager/ssl/tests/unit/test_session_resumption.js
diff --git a/security/manager/ssl/tests/unit/test_signed_apps-marketplace.js b/system/security/manager/ssl/tests/unit/test_signed_apps-marketplace.js
index 9f2af752d..9f2af752d 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps-marketplace.js
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps-marketplace.js
diff --git a/security/manager/ssl/tests/unit/test_signed_apps.js b/system/security/manager/ssl/tests/unit/test_signed_apps.js
index 819ea767a..819ea767a 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps.js
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps.js
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/README.md b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/README.md
index 5c6201534..5c6201534 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/README.md
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/README.md
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/create_test_files.sh b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/create_test_files.sh
index e211c3685..e211c3685 100755..100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/create_test_files.sh
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/create_test_files.sh
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/nss_ctypes.py b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/nss_ctypes.py
index 35ca92959..35ca92959 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/nss_ctypes.py
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/nss_ctypes.py
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/sign_b2g_app.py b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/sign_b2g_app.py
index 89b385a9b..89b385a9b 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/sign_b2g_app.py
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/sign_b2g_app.py
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/icon-128.png b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/icon-128.png
index d6fd07a41..d6fd07a41 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/icon-128.png
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/icon-128.png
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html
index 2acf635e8..2acf635e8 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/manifest.webapp b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/manifest.webapp
index 447cd1e71..447cd1e71 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/manifest.webapp
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/manifest.webapp
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/icon-128.png b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/icon-128.png
index d6fd07a41..d6fd07a41 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/icon-128.png
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/icon-128.png
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/index.html b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/index.html
index 9f2adf57b..9f2adf57b 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/index.html
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/index.html
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/manifest.webapp b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/manifest.webapp
index d2393e3c3..d2393e3c3 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/manifest.webapp
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin/manifest.webapp
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/index.html b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/index.html
index 12c6881c2..12c6881c2 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/index.html
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/index.html
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/manifest.webapp b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/manifest.webapp
index 55103ca5a..55103ca5a 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/manifest.webapp
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_origin_toolkit_webapps/manifest.webapp
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/privileged-app-test-1.0.zip b/system/security/manager/ssl/tests/unit/test_signed_apps/privileged-app-test-1.0.zip
index 3a12106c8..3a12106c8 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/privileged-app-test-1.0.zip
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/privileged-app-test-1.0.zip
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/test-privileged-app-test-1.0.zip b/system/security/manager/ssl/tests/unit/test_signed_apps/test-privileged-app-test-1.0.zip
index ec137ea14..ec137ea14 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/test-privileged-app-test-1.0.zip
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/test-privileged-app-test-1.0.zip
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/trusted_ca1.der b/system/security/manager/ssl/tests/unit/test_signed_apps/trusted_ca1.der
index 0200a7f35..0200a7f35 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/trusted_ca1.der
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/trusted_ca1.der
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/unknown_issuer_app_1.zip b/system/security/manager/ssl/tests/unit/test_signed_apps/unknown_issuer_app_1.zip
index 374e45f6f..374e45f6f 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/unknown_issuer_app_1.zip
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/unknown_issuer_app_1.zip
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/unsigned_app_1.zip b/system/security/manager/ssl/tests/unit/test_signed_apps/unsigned_app_1.zip
index 731e050ab..731e050ab 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/unsigned_app_1.zip
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/unsigned_app_1.zip
diff --git a/security/manager/ssl/tests/unit/test_signed_apps/valid_app_1.zip b/system/security/manager/ssl/tests/unit/test_signed_apps/valid_app_1.zip
index 74a35a420..74a35a420 100644
--- a/security/manager/ssl/tests/unit/test_signed_apps/valid_app_1.zip
+++ b/system/security/manager/ssl/tests/unit/test_signed_apps/valid_app_1.zip
diff --git a/security/manager/ssl/tests/unit/test_signed_dir.js b/system/security/manager/ssl/tests/unit/test_signed_dir.js
index b07fd2285..b07fd2285 100644
--- a/security/manager/ssl/tests/unit/test_signed_dir.js
+++ b/system/security/manager/ssl/tests/unit/test_signed_dir.js
diff --git a/security/manager/ssl/tests/unit/test_signed_dir/lightbeam_for_firefox-1.3.1-fx.xpi b/system/security/manager/ssl/tests/unit/test_signed_dir/lightbeam_for_firefox-1.3.1-fx.xpi
index 902b731f3..902b731f3 100644
--- a/security/manager/ssl/tests/unit/test_signed_dir/lightbeam_for_firefox-1.3.1-fx.xpi
+++ b/system/security/manager/ssl/tests/unit/test_signed_dir/lightbeam_for_firefox-1.3.1-fx.xpi
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/README.md b/system/security/manager/ssl/tests/unit/test_signed_manifest/README.md
index a442c7052..a442c7052 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/README.md
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/README.md
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/create_test_files.sh b/system/security/manager/ssl/tests/unit/test_signed_manifest/create_test_files.sh
index cddbe17ec..cddbe17ec 100755..100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/create_test_files.sh
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/create_test_files.sh
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/manifest.webapp b/system/security/manager/ssl/tests/unit/test_signed_manifest/manifest.webapp
index ad477719b..ad477719b 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/manifest.webapp
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/manifest.webapp
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py b/system/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py
index ad2dec8b5..ad2dec8b5 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py b/system/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py
index 6e714b4fd..6e714b4fd 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/testInvalidSignedManifest/manifest.sig b/system/security/manager/ssl/tests/unit/test_signed_manifest/testInvalidSignedManifest/manifest.sig
index d5eee196c..d5eee196c 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/testInvalidSignedManifest/manifest.sig
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/testInvalidSignedManifest/manifest.sig
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/testValidSignedManifest/manifest.sig b/system/security/manager/ssl/tests/unit/test_signed_manifest/testValidSignedManifest/manifest.sig
index 996226351..996226351 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/testValidSignedManifest/manifest.sig
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/testValidSignedManifest/manifest.sig
diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/trusted_ca1.der b/system/security/manager/ssl/tests/unit/test_signed_manifest/trusted_ca1.der
index bf05308cc..bf05308cc 100644
--- a/security/manager/ssl/tests/unit/test_signed_manifest/trusted_ca1.der
+++ b/system/security/manager/ssl/tests/unit/test_signed_manifest/trusted_ca1.der
diff --git a/security/manager/ssl/tests/unit/test_sss_eviction.js b/system/security/manager/ssl/tests/unit/test_sss_eviction.js
index 0ac8983f6..0ac8983f6 100644
--- a/security/manager/ssl/tests/unit/test_sss_eviction.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_eviction.js
diff --git a/security/manager/ssl/tests/unit/test_sss_readstate.js b/system/security/manager/ssl/tests/unit/test_sss_readstate.js
index 8b7e8cbb5..8b7e8cbb5 100644
--- a/security/manager/ssl/tests/unit/test_sss_readstate.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_readstate.js
diff --git a/security/manager/ssl/tests/unit/test_sss_readstate_child.js b/system/security/manager/ssl/tests/unit/test_sss_readstate_child.js
index 80f00c31a..80f00c31a 100644
--- a/security/manager/ssl/tests/unit/test_sss_readstate_child.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_readstate_child.js
diff --git a/security/manager/ssl/tests/unit/test_sss_readstate_empty.js b/system/security/manager/ssl/tests/unit/test_sss_readstate_empty.js
index c4605c0af..c4605c0af 100644
--- a/security/manager/ssl/tests/unit/test_sss_readstate_empty.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_readstate_empty.js
diff --git a/security/manager/ssl/tests/unit/test_sss_readstate_garbage.js b/system/security/manager/ssl/tests/unit/test_sss_readstate_garbage.js
index 1ca277da4..1ca277da4 100644
--- a/security/manager/ssl/tests/unit/test_sss_readstate_garbage.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_readstate_garbage.js
diff --git a/security/manager/ssl/tests/unit/test_sss_readstate_huge.js b/system/security/manager/ssl/tests/unit/test_sss_readstate_huge.js
index eec93b6f4..eec93b6f4 100644
--- a/security/manager/ssl/tests/unit/test_sss_readstate_huge.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_readstate_huge.js
diff --git a/security/manager/ssl/tests/unit/test_sss_savestate.js b/system/security/manager/ssl/tests/unit/test_sss_savestate.js
index fefa64ea6..fefa64ea6 100644
--- a/security/manager/ssl/tests/unit/test_sss_savestate.js
+++ b/system/security/manager/ssl/tests/unit/test_sss_savestate.js
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign.js b/system/security/manager/ssl/tests/unit/test_startcom_wosign.js
index 4ba89ca73..4ba89ca73 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign.js
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign.js
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem
index a3914b33f..a3914b33f 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem.certspec
index 9f0fe22fc..9f0fe22fc 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-after-cutoff.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem
index a219e745f..a219e745f 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem.certspec
index b7fbd4954..b7fbd4954 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartCom-before-cutoff.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem
index 720c59d4f..720c59d4f 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem.certspec
index ee5d9fff1..ee5d9fff1 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/StartComCA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem
index 5d7d50527..5d7d50527 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem.certspec
index 2afb5d6ea..2afb5d6ea 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-after-cutoff.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem
index 09c661a92..09c661a92 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem.certspec
index 224522bf0..224522bf0 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSign-before-cutoff.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem
index 30199bb3f..30199bb3f 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem.certspec
index db92c5f6d..db92c5f6d 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/WoSignCA.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem b/system/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem
index 4e4cb7814..4e4cb7814 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem.certspec b/system/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem.certspec
index efd24b153..efd24b153 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/ca.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build b/system/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build
index 16de950bc..16de950bc 100644
--- a/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_startcom_wosign/moz.build
diff --git a/security/manager/ssl/tests/unit/test_sts_fqdn.js b/system/security/manager/ssl/tests/unit/test_sts_fqdn.js
index c2c3eb2bd..c2c3eb2bd 100644
--- a/security/manager/ssl/tests/unit/test_sts_fqdn.js
+++ b/system/security/manager/ssl/tests/unit/test_sts_fqdn.js
diff --git a/security/manager/ssl/tests/unit/test_sts_ipv4_ipv6.js b/system/security/manager/ssl/tests/unit/test_sts_ipv4_ipv6.js
index 934fa4c3a..934fa4c3a 100644
--- a/security/manager/ssl/tests/unit/test_sts_ipv4_ipv6.js
+++ b/system/security/manager/ssl/tests/unit/test_sts_ipv4_ipv6.js
diff --git a/security/manager/ssl/tests/unit/test_sts_preloadlist_perwindowpb.js b/system/security/manager/ssl/tests/unit/test_sts_preloadlist_perwindowpb.js
index e83f6f5b9..e83f6f5b9 100644
--- a/security/manager/ssl/tests/unit/test_sts_preloadlist_perwindowpb.js
+++ b/system/security/manager/ssl/tests/unit/test_sts_preloadlist_perwindowpb.js
diff --git a/security/manager/ssl/tests/unit/test_sts_preloadlist_selfdestruct.js b/system/security/manager/ssl/tests/unit/test_sts_preloadlist_selfdestruct.js
index 8b75b52ae..8b75b52ae 100644
--- a/security/manager/ssl/tests/unit/test_sts_preloadlist_selfdestruct.js
+++ b/system/security/manager/ssl/tests/unit/test_sts_preloadlist_selfdestruct.js
diff --git a/security/manager/ssl/tests/unit/test_validity.js b/system/security/manager/ssl/tests/unit/test_validity.js
index 9158c7a5d..9158c7a5d 100644
--- a/security/manager/ssl/tests/unit/test_validity.js
+++ b/system/security/manager/ssl/tests/unit/test_validity.js
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem
index 6a351f0f8..6a351f0f8 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
index d2c7fa127..d2c7fa127 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem
index 28d7bdb90..28d7bdb90 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
index 2dcfb2e29..2dcfb2e29 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key
index 8af23e068..8af23e068 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key.keyspec b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key.keyspec
index 4ad96d515..4ad96d515 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem
index 370f4ff36..370f4ff36 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem.certspec
index e169514ff..e169514ff 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_validity/evroot.key b/system/security/manager/ssl/tests/unit/test_validity/evroot.key
index a756a0705..a756a0705 100644
--- a/security/manager/ssl/tests/unit/test_validity/evroot.key
+++ b/system/security/manager/ssl/tests/unit/test_validity/evroot.key
diff --git a/security/manager/ssl/tests/unit/test_validity/evroot.key.keyspec b/system/security/manager/ssl/tests/unit/test_validity/evroot.key.keyspec
index 1a3d76a55..1a3d76a55 100644
--- a/security/manager/ssl/tests/unit/test_validity/evroot.key.keyspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/evroot.key.keyspec
diff --git a/security/manager/ssl/tests/unit/test_validity/evroot.pem b/system/security/manager/ssl/tests/unit/test_validity/evroot.pem
index cd2fd7ed8..cd2fd7ed8 100644
--- a/security/manager/ssl/tests/unit/test_validity/evroot.pem
+++ b/system/security/manager/ssl/tests/unit/test_validity/evroot.pem
diff --git a/security/manager/ssl/tests/unit/test_validity/evroot.pem.certspec b/system/security/manager/ssl/tests/unit/test_validity/evroot.pem.certspec
index 3121f3486..3121f3486 100644
--- a/security/manager/ssl/tests/unit/test_validity/evroot.pem.certspec
+++ b/system/security/manager/ssl/tests/unit/test_validity/evroot.pem.certspec
diff --git a/security/manager/ssl/tests/unit/test_validity/moz.build b/system/security/manager/ssl/tests/unit/test_validity/moz.build
index 48e7d1541..48e7d1541 100644
--- a/security/manager/ssl/tests/unit/test_validity/moz.build
+++ b/system/security/manager/ssl/tests/unit/test_validity/moz.build
diff --git a/security/manager/ssl/tests/unit/test_weak_crypto.js b/system/security/manager/ssl/tests/unit/test_weak_crypto.js
index 3367e9067..3367e9067 100644
--- a/security/manager/ssl/tests/unit/test_weak_crypto.js
+++ b/system/security/manager/ssl/tests/unit/test_weak_crypto.js
diff --git a/security/manager/ssl/tests/unit/test_x509.js b/system/security/manager/ssl/tests/unit/test_x509.js
index 4c22e28d1..4c22e28d1 100644
--- a/security/manager/ssl/tests/unit/test_x509.js
+++ b/system/security/manager/ssl/tests/unit/test_x509.js
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp b/system/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp
index 348dcfc5c..348dcfc5c 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp
+++ b/system/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/GenerateOCSPResponse.cpp b/system/security/manager/ssl/tests/unit/tlsserver/cmd/GenerateOCSPResponse.cpp
index 22a576d83..22a576d83 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/GenerateOCSPResponse.cpp
+++ b/system/security/manager/ssl/tests/unit/tlsserver/cmd/GenerateOCSPResponse.cpp
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp b/system/security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp
index 6bf33a143..6bf33a143 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp
+++ b/system/security/manager/ssl/tests/unit/tlsserver/cmd/OCSPStaplingServer.cpp
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build b/system/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
index 4f28d9862..4f28d9862 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
+++ b/system/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
diff --git a/security/manager/ssl/tests/unit/tlsserver/default-ee.der b/system/security/manager/ssl/tests/unit/tlsserver/default-ee.der
index 3a9b8fa9b..3a9b8fa9b 100644
--- a/security/manager/ssl/tests/unit/tlsserver/default-ee.der
+++ b/system/security/manager/ssl/tests/unit/tlsserver/default-ee.der
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp b/system/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
index 5c99edade..5c99edade 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
+++ b/system/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.h b/system/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.h
index 5a88d6e52..5a88d6e52 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.h
+++ b/system/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.h
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp b/system/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp
index fcf6aa951..fcf6aa951 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp
+++ b/system/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h b/system/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h
index f1dc1569a..f1dc1569a 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h
+++ b/system/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/moz.build b/system/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
index 280dbc607..280dbc607 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
+++ b/system/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
diff --git a/security/manager/ssl/tests/unit/tlsserver/moz.build b/system/security/manager/ssl/tests/unit/tlsserver/moz.build
index 08f51fa90..08f51fa90 100644
--- a/security/manager/ssl/tests/unit/tlsserver/moz.build
+++ b/system/security/manager/ssl/tests/unit/tlsserver/moz.build
diff --git a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini b/system/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
index df099b746..df099b746 100644
--- a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+++ b/system/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/system/security/manager/ssl/tests/unit/xpcshell.ini
index 01384b19a..01384b19a 100644
--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/system/security/manager/ssl/tests/unit/xpcshell.ini
diff --git a/security/manager/tools/.eslintrc.js b/system/security/manager/tools/.eslintrc.js
index 49de9eadd..49de9eadd 100644
--- a/security/manager/tools/.eslintrc.js
+++ b/system/security/manager/tools/.eslintrc.js
diff --git a/security/manager/tools/KnownRootHashes.json b/system/security/manager/tools/KnownRootHashes.json
index 81adeb653..81adeb653 100644
--- a/security/manager/tools/KnownRootHashes.json
+++ b/system/security/manager/tools/KnownRootHashes.json
diff --git a/security/manager/tools/dumpGoogleRoots.js b/system/security/manager/tools/dumpGoogleRoots.js
index 2daa20434..2daa20434 100644
--- a/security/manager/tools/dumpGoogleRoots.js
+++ b/system/security/manager/tools/dumpGoogleRoots.js
diff --git a/security/manager/tools/genRootCAHashes.js b/system/security/manager/tools/genRootCAHashes.js
index 0d6f1df48..0d6f1df48 100644
--- a/security/manager/tools/genRootCAHashes.js
+++ b/system/security/manager/tools/genRootCAHashes.js
diff --git a/security/manager/tools/makeCNNICHashes.js b/system/security/manager/tools/makeCNNICHashes.js
index 1b558949e..1b558949e 100644
--- a/security/manager/tools/makeCNNICHashes.js
+++ b/system/security/manager/tools/makeCNNICHashes.js
diff --git a/system/security/moz.build b/system/security/moz.build
new file mode 100644
index 000000000..1c10b1319
--- /dev/null
+++ b/system/security/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+  'apps',
+  'certverifier',
+  'content',
+  'manager',
+  'script',
+]
\ No newline at end of file
diff --git a/security/pkix/include/pkix-test/pkixtestnss.h b/system/security/pkix/include/pkix-test/pkixtestnss.h
index 596be6352..596be6352 100644
--- a/security/pkix/include/pkix-test/pkixtestnss.h
+++ b/system/security/pkix/include/pkix-test/pkixtestnss.h
diff --git a/security/pkix/include/pkix-test/pkixtestutil.h b/system/security/pkix/include/pkix-test/pkixtestutil.h
index 1841e9380..1841e9380 100644
--- a/security/pkix/include/pkix-test/pkixtestutil.h
+++ b/system/security/pkix/include/pkix-test/pkixtestutil.h
diff --git a/security/pkix/include/pkix/Input.h b/system/security/pkix/include/pkix/Input.h
index 4aa415720..4aa415720 100644
--- a/security/pkix/include/pkix/Input.h
+++ b/system/security/pkix/include/pkix/Input.h
diff --git a/security/pkix/include/pkix/Result.h b/system/security/pkix/include/pkix/Result.h
index 0e0cfdf11..0e0cfdf11 100644
--- a/security/pkix/include/pkix/Result.h
+++ b/system/security/pkix/include/pkix/Result.h
diff --git a/security/pkix/include/pkix/Time.h b/system/security/pkix/include/pkix/Time.h
index 251533016..251533016 100644
--- a/security/pkix/include/pkix/Time.h
+++ b/system/security/pkix/include/pkix/Time.h
diff --git a/security/pkix/include/pkix/pkix.h b/system/security/pkix/include/pkix/pkix.h
index 2ceec0641..2ceec0641 100644
--- a/security/pkix/include/pkix/pkix.h
+++ b/system/security/pkix/include/pkix/pkix.h
diff --git a/security/pkix/include/pkix/pkixcheck.h b/system/security/pkix/include/pkix/pkixcheck.h
index 385a04bcb..385a04bcb 100644
--- a/security/pkix/include/pkix/pkixcheck.h
+++ b/system/security/pkix/include/pkix/pkixcheck.h
diff --git a/security/pkix/include/pkix/pkixder.h b/system/security/pkix/include/pkix/pkixder.h
index 2d9fbb87c..2d9fbb87c 100644
--- a/security/pkix/include/pkix/pkixder.h
+++ b/system/security/pkix/include/pkix/pkixder.h
diff --git a/security/pkix/include/pkix/pkixnss.h b/system/security/pkix/include/pkix/pkixnss.h
index 43b198d51..43b198d51 100644
--- a/security/pkix/include/pkix/pkixnss.h
+++ b/system/security/pkix/include/pkix/pkixnss.h
diff --git a/security/pkix/include/pkix/pkixtypes.h b/system/security/pkix/include/pkix/pkixtypes.h
index 7023faac4..7023faac4 100644
--- a/security/pkix/include/pkix/pkixtypes.h
+++ b/system/security/pkix/include/pkix/pkixtypes.h
diff --git a/security/pkix/include/pkix/pkixutil.h b/system/security/pkix/include/pkix/pkixutil.h
index 8de36de0a..8de36de0a 100644
--- a/security/pkix/include/pkix/pkixutil.h
+++ b/system/security/pkix/include/pkix/pkixutil.h
diff --git a/security/pkix/lib/pkixbuild.cpp b/system/security/pkix/lib/pkixbuild.cpp
index 02de1ff70..02de1ff70 100644
--- a/security/pkix/lib/pkixbuild.cpp
+++ b/system/security/pkix/lib/pkixbuild.cpp
diff --git a/security/pkix/lib/pkixcert.cpp b/system/security/pkix/lib/pkixcert.cpp
index bdac0482c..bdac0482c 100644
--- a/security/pkix/lib/pkixcert.cpp
+++ b/system/security/pkix/lib/pkixcert.cpp
diff --git a/security/pkix/lib/pkixcheck.cpp b/system/security/pkix/lib/pkixcheck.cpp
index 3828283c8..3828283c8 100644
--- a/security/pkix/lib/pkixcheck.cpp
+++ b/system/security/pkix/lib/pkixcheck.cpp
diff --git a/security/pkix/lib/pkixder.cpp b/system/security/pkix/lib/pkixder.cpp
index f1fc84973..f1fc84973 100644
--- a/security/pkix/lib/pkixder.cpp
+++ b/system/security/pkix/lib/pkixder.cpp
diff --git a/security/pkix/lib/pkixnames.cpp b/system/security/pkix/lib/pkixnames.cpp
index f4349d799..f4349d799 100644
--- a/security/pkix/lib/pkixnames.cpp
+++ b/system/security/pkix/lib/pkixnames.cpp
diff --git a/security/pkix/lib/pkixnss.cpp b/system/security/pkix/lib/pkixnss.cpp
index c4928ed53..c4928ed53 100644
--- a/security/pkix/lib/pkixnss.cpp
+++ b/system/security/pkix/lib/pkixnss.cpp
diff --git a/security/pkix/lib/pkixocsp.cpp b/system/security/pkix/lib/pkixocsp.cpp
index 03f88bafc..03f88bafc 100644
--- a/security/pkix/lib/pkixocsp.cpp
+++ b/system/security/pkix/lib/pkixocsp.cpp
diff --git a/security/pkix/lib/pkixresult.cpp b/system/security/pkix/lib/pkixresult.cpp
index 9aa2139ca..9aa2139ca 100644
--- a/security/pkix/lib/pkixresult.cpp
+++ b/system/security/pkix/lib/pkixresult.cpp
diff --git a/security/pkix/lib/pkixtime.cpp b/system/security/pkix/lib/pkixtime.cpp
index 1d7388584..1d7388584 100644
--- a/security/pkix/lib/pkixtime.cpp
+++ b/system/security/pkix/lib/pkixtime.cpp
diff --git a/security/pkix/lib/pkixverify.cpp b/system/security/pkix/lib/pkixverify.cpp
index 935ca11d9..935ca11d9 100644
--- a/security/pkix/lib/pkixverify.cpp
+++ b/system/security/pkix/lib/pkixverify.cpp
diff --git a/security/pkix/moz.build b/system/security/pkix/moz.build
index 3ebecaa0b..3ebecaa0b 100644
--- a/security/pkix/moz.build
+++ b/system/security/pkix/moz.build
diff --git a/security/pkix/test/gtest/README.txt b/system/security/pkix/test/gtest/README.txt
index 5d3484a21..5d3484a21 100644
--- a/security/pkix/test/gtest/README.txt
+++ b/system/security/pkix/test/gtest/README.txt
diff --git a/security/pkix/test/gtest/moz.build b/system/security/pkix/test/gtest/moz.build
index 711a861af..711a861af 100644
--- a/security/pkix/test/gtest/moz.build
+++ b/system/security/pkix/test/gtest/moz.build
diff --git a/security/pkix/test/gtest/pkixbuild_tests.cpp b/system/security/pkix/test/gtest/pkixbuild_tests.cpp
index 7c70acda3..7c70acda3 100644
--- a/security/pkix/test/gtest/pkixbuild_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixbuild_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcert_extension_tests.cpp b/system/security/pkix/test/gtest/pkixcert_extension_tests.cpp
index f00306882..f00306882 100644
--- a/security/pkix/test/gtest/pkixcert_extension_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcert_extension_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp b/system/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp
index 311ad791f..311ad791f 100644
--- a/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp
index fbb323499..fbb323499 100644
--- a/security/pkix/test/gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_CheckIssuer_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_CheckIssuer_tests.cpp
index e2be00ee6..e2be00ee6 100644
--- a/security/pkix/test/gtest/pkixcheck_CheckIssuer_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_CheckIssuer_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp
index 3db480f0b..3db480f0b 100644
--- a/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
index af2c678a7..af2c678a7 100644
--- a/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp
index 6095cf183..6095cf183 100644
--- a/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_ParseValidity_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_ParseValidity_tests.cpp
index 0f1d27fcc..0f1d27fcc 100644
--- a/security/pkix/test/gtest/pkixcheck_ParseValidity_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_ParseValidity_tests.cpp
diff --git a/security/pkix/test/gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp b/system/security/pkix/test/gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp
index 4e5a63347..4e5a63347 100644
--- a/security/pkix/test/gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp
diff --git a/security/pkix/test/gtest/pkixder_input_tests.cpp b/system/security/pkix/test/gtest/pkixder_input_tests.cpp
index e3dbdbbcd..e3dbdbbcd 100644
--- a/security/pkix/test/gtest/pkixder_input_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixder_input_tests.cpp
diff --git a/security/pkix/test/gtest/pkixder_pki_types_tests.cpp b/system/security/pkix/test/gtest/pkixder_pki_types_tests.cpp
index c0e69c920..c0e69c920 100644
--- a/security/pkix/test/gtest/pkixder_pki_types_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixder_pki_types_tests.cpp
diff --git a/security/pkix/test/gtest/pkixder_universal_types_tests.cpp b/system/security/pkix/test/gtest/pkixder_universal_types_tests.cpp
index 2949d23fe..2949d23fe 100644
--- a/security/pkix/test/gtest/pkixder_universal_types_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixder_universal_types_tests.cpp
diff --git a/security/pkix/test/gtest/pkixgtest.cpp b/system/security/pkix/test/gtest/pkixgtest.cpp
index 9170aee01..9170aee01 100644
--- a/security/pkix/test/gtest/pkixgtest.cpp
+++ b/system/security/pkix/test/gtest/pkixgtest.cpp
diff --git a/security/pkix/test/gtest/pkixgtest.h b/system/security/pkix/test/gtest/pkixgtest.h
index b53d63be0..b53d63be0 100644
--- a/security/pkix/test/gtest/pkixgtest.h
+++ b/system/security/pkix/test/gtest/pkixgtest.h
diff --git a/security/pkix/test/gtest/pkixnames_tests.cpp b/system/security/pkix/test/gtest/pkixnames_tests.cpp
index 52bf49413..52bf49413 100644
--- a/security/pkix/test/gtest/pkixnames_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixnames_tests.cpp
diff --git a/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp b/system/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
index 99b168c4f..99b168c4f 100644
--- a/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
+++ b/system/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
diff --git a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp b/system/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
index 9121a6f8f..9121a6f8f 100644
--- a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
+++ b/system/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
diff --git a/security/pkix/test/lib/moz.build b/system/security/pkix/test/lib/moz.build
index c99aedf3a..c99aedf3a 100644
--- a/security/pkix/test/lib/moz.build
+++ b/system/security/pkix/test/lib/moz.build
diff --git a/security/pkix/test/lib/pkixtestalg.cpp b/system/security/pkix/test/lib/pkixtestalg.cpp
index d698154d0..d698154d0 100644
--- a/security/pkix/test/lib/pkixtestalg.cpp
+++ b/system/security/pkix/test/lib/pkixtestalg.cpp
diff --git a/security/pkix/test/lib/pkixtestnss.cpp b/system/security/pkix/test/lib/pkixtestnss.cpp
index 001fdfbc4..001fdfbc4 100644
--- a/security/pkix/test/lib/pkixtestnss.cpp
+++ b/system/security/pkix/test/lib/pkixtestnss.cpp
diff --git a/security/pkix/test/lib/pkixtestutil.cpp b/system/security/pkix/test/lib/pkixtestutil.cpp
index 32401af81..32401af81 100644
--- a/security/pkix/test/lib/pkixtestutil.cpp
+++ b/system/security/pkix/test/lib/pkixtestutil.cpp
diff --git a/security/pkix/tools/DottedOIDToCode.py b/system/security/pkix/tools/DottedOIDToCode.py
index dfd4ade07..dfd4ade07 100644
--- a/security/pkix/tools/DottedOIDToCode.py
+++ b/system/security/pkix/tools/DottedOIDToCode.py
diff --git a/security/pkix/warnings.mozbuild b/system/security/pkix/warnings.mozbuild
index 3fdc10bd7..3fdc10bd7 100644
--- a/security/pkix/warnings.mozbuild
+++ b/system/security/pkix/warnings.mozbuild
diff --git a/caps/BasePrincipal.cpp b/system/security/script/BasePrincipal.cpp
index cdd4665fc..cdd4665fc 100644
--- a/caps/BasePrincipal.cpp
+++ b/system/security/script/BasePrincipal.cpp
diff --git a/caps/BasePrincipal.h b/system/security/script/BasePrincipal.h
index f6a179fa8..f6a179fa8 100644
--- a/caps/BasePrincipal.h
+++ b/system/security/script/BasePrincipal.h
diff --git a/caps/DomainPolicy.cpp b/system/security/script/DomainPolicy.cpp
index 5296d6751..5296d6751 100644
--- a/caps/DomainPolicy.cpp
+++ b/system/security/script/DomainPolicy.cpp
diff --git a/caps/DomainPolicy.h b/system/security/script/DomainPolicy.h
index c759a715d..c759a715d 100644
--- a/caps/DomainPolicy.h
+++ b/system/security/script/DomainPolicy.h
diff --git a/caps/moz.build b/system/security/script/moz.build
index 42bb5ded3..42bb5ded3 100644
--- a/caps/moz.build
+++ b/system/security/script/moz.build
diff --git a/caps/nsIAddonPolicyService.idl b/system/security/script/nsIAddonPolicyService.idl
index cf444acaa..cf444acaa 100644
--- a/caps/nsIAddonPolicyService.idl
+++ b/system/security/script/nsIAddonPolicyService.idl
diff --git a/caps/nsIDomainPolicy.idl b/system/security/script/nsIDomainPolicy.idl
index 54b0de4db..54b0de4db 100644
--- a/caps/nsIDomainPolicy.idl
+++ b/system/security/script/nsIDomainPolicy.idl
diff --git a/caps/nsIPrincipal.idl b/system/security/script/nsIPrincipal.idl
index d278decdb..d278decdb 100644
--- a/caps/nsIPrincipal.idl
+++ b/system/security/script/nsIPrincipal.idl
diff --git a/caps/nsIScriptSecurityManager.idl b/system/security/script/nsIScriptSecurityManager.idl
index 08debc528..08debc528 100644
--- a/caps/nsIScriptSecurityManager.idl
+++ b/system/security/script/nsIScriptSecurityManager.idl
diff --git a/caps/nsJSPrincipals.cpp b/system/security/script/nsJSPrincipals.cpp
index 8349aed53..8349aed53 100644
--- a/caps/nsJSPrincipals.cpp
+++ b/system/security/script/nsJSPrincipals.cpp
diff --git a/caps/nsJSPrincipals.h b/system/security/script/nsJSPrincipals.h
index 5499345da..5499345da 100644
--- a/caps/nsJSPrincipals.h
+++ b/system/security/script/nsJSPrincipals.h
diff --git a/caps/nsNullPrincipal.cpp b/system/security/script/nsNullPrincipal.cpp
index cbea2839e..cbea2839e 100644
--- a/caps/nsNullPrincipal.cpp
+++ b/system/security/script/nsNullPrincipal.cpp
diff --git a/caps/nsNullPrincipal.h b/system/security/script/nsNullPrincipal.h
index b29474773..b29474773 100644
--- a/caps/nsNullPrincipal.h
+++ b/system/security/script/nsNullPrincipal.h
diff --git a/caps/nsNullPrincipalURI.cpp b/system/security/script/nsNullPrincipalURI.cpp
index 159928ba6..159928ba6 100644
--- a/caps/nsNullPrincipalURI.cpp
+++ b/system/security/script/nsNullPrincipalURI.cpp
diff --git a/caps/nsNullPrincipalURI.h b/system/security/script/nsNullPrincipalURI.h
index 63d7221c2..63d7221c2 100644
--- a/caps/nsNullPrincipalURI.h
+++ b/system/security/script/nsNullPrincipalURI.h
diff --git a/caps/nsPrincipal.cpp b/system/security/script/nsPrincipal.cpp
index 05d00c80a..05d00c80a 100644
--- a/caps/nsPrincipal.cpp
+++ b/system/security/script/nsPrincipal.cpp
diff --git a/caps/nsPrincipal.h b/system/security/script/nsPrincipal.h
index d20d81ee3..d20d81ee3 100644
--- a/caps/nsPrincipal.h
+++ b/system/security/script/nsPrincipal.h
diff --git a/caps/nsScriptSecurityManager.cpp b/system/security/script/nsScriptSecurityManager.cpp
index 8f36fa917..8f36fa917 100644
--- a/caps/nsScriptSecurityManager.cpp
+++ b/system/security/script/nsScriptSecurityManager.cpp
diff --git a/caps/nsScriptSecurityManager.h b/system/security/script/nsScriptSecurityManager.h
index c5a1e5cd2..c5a1e5cd2 100644
--- a/caps/nsScriptSecurityManager.h
+++ b/system/security/script/nsScriptSecurityManager.h
diff --git a/caps/nsSystemPrincipal.cpp b/system/security/script/nsSystemPrincipal.cpp
index 7bfa20efc..7bfa20efc 100644
--- a/caps/nsSystemPrincipal.cpp
+++ b/system/security/script/nsSystemPrincipal.cpp
diff --git a/caps/nsSystemPrincipal.h b/system/security/script/nsSystemPrincipal.h
index 5faec50cf..5faec50cf 100644
--- a/caps/nsSystemPrincipal.h
+++ b/system/security/script/nsSystemPrincipal.h
diff --git a/caps/tests/gtest/TestOriginAttributes.cpp b/system/security/script/tests/gtest/TestOriginAttributes.cpp
index e11bf28eb..e11bf28eb 100644
--- a/caps/tests/gtest/TestOriginAttributes.cpp
+++ b/system/security/script/tests/gtest/TestOriginAttributes.cpp
diff --git a/caps/tests/gtest/moz.build b/system/security/script/tests/gtest/moz.build
index e915c0b1f..e915c0b1f 100644
--- a/caps/tests/gtest/moz.build
+++ b/system/security/script/tests/gtest/moz.build
diff --git a/caps/tests/mochitest/browser.ini b/system/security/script/tests/mochitest/browser.ini
index d8a1278f9..d8a1278f9 100644
--- a/caps/tests/mochitest/browser.ini
+++ b/system/security/script/tests/mochitest/browser.ini
diff --git a/caps/tests/mochitest/browser_checkloaduri.js b/system/security/script/tests/mochitest/browser_checkloaduri.js
index 24a97c1c4..24a97c1c4 100644
--- a/caps/tests/mochitest/browser_checkloaduri.js
+++ b/system/security/script/tests/mochitest/browser_checkloaduri.js
diff --git a/caps/tests/mochitest/chrome.ini b/system/security/script/tests/mochitest/chrome.ini
index ee71ad30b..2d41645bd 100644
--- a/caps/tests/mochitest/chrome.ini
+++ b/system/security/script/tests/mochitest/chrome.ini
@@ -2,7 +2,7 @@
 skip-if = os == 'android'
 support-files =
   file_disableScript.html
-  !/caps/tests/mochitest/file_disableScript.html
+  !/system/security/script/tests/mochitest/file_disableScript.html
 
 [test_bug995943.xul]
 [test_addonMayLoad.html]
diff --git a/caps/tests/mochitest/file_data.txt b/system/security/script/tests/mochitest/file_data.txt
index 26d7bd848..26d7bd848 100644
--- a/caps/tests/mochitest/file_data.txt
+++ b/system/security/script/tests/mochitest/file_data.txt
diff --git a/caps/tests/mochitest/file_disableScript.html b/system/security/script/tests/mochitest/file_disableScript.html
index f4888cd58..f4888cd58 100644
--- a/caps/tests/mochitest/file_disableScript.html
+++ b/system/security/script/tests/mochitest/file_disableScript.html
diff --git a/caps/tests/mochitest/mochitest.ini b/system/security/script/tests/mochitest/mochitest.ini
index 866553ea2..866553ea2 100644
--- a/caps/tests/mochitest/mochitest.ini
+++ b/system/security/script/tests/mochitest/mochitest.ini
diff --git a/caps/tests/mochitest/resource_test_file.html b/system/security/script/tests/mochitest/resource_test_file.html
index 8201bd70e..8201bd70e 100644
--- a/caps/tests/mochitest/resource_test_file.html
+++ b/system/security/script/tests/mochitest/resource_test_file.html
diff --git a/caps/tests/mochitest/test_addonMayLoad.html b/system/security/script/tests/mochitest/test_addonMayLoad.html
index 286284bfe..286284bfe 100644
--- a/caps/tests/mochitest/test_addonMayLoad.html
+++ b/system/security/script/tests/mochitest/test_addonMayLoad.html
diff --git a/caps/tests/mochitest/test_app_principal_equality.html b/system/security/script/tests/mochitest/test_app_principal_equality.html
index f59f1f789..f59f1f789 100644
--- a/caps/tests/mochitest/test_app_principal_equality.html
+++ b/system/security/script/tests/mochitest/test_app_principal_equality.html
diff --git a/caps/tests/mochitest/test_bug246699.html b/system/security/script/tests/mochitest/test_bug246699.html
index bb733e5df..bb733e5df 100644
--- a/caps/tests/mochitest/test_bug246699.html
+++ b/system/security/script/tests/mochitest/test_bug246699.html
diff --git a/caps/tests/mochitest/test_bug292789.html b/system/security/script/tests/mochitest/test_bug292789.html
index 291ba00c1..291ba00c1 100644
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/system/security/script/tests/mochitest/test_bug292789.html
diff --git a/caps/tests/mochitest/test_bug423375.html b/system/security/script/tests/mochitest/test_bug423375.html
index 1cd2a7a82..1cd2a7a82 100644
--- a/caps/tests/mochitest/test_bug423375.html
+++ b/system/security/script/tests/mochitest/test_bug423375.html
diff --git a/caps/tests/mochitest/test_bug470804.html b/system/security/script/tests/mochitest/test_bug470804.html
index 9ac88c8d7..9ac88c8d7 100644
--- a/caps/tests/mochitest/test_bug470804.html
+++ b/system/security/script/tests/mochitest/test_bug470804.html
diff --git a/caps/tests/mochitest/test_bug995943.xul b/system/security/script/tests/mochitest/test_bug995943.xul
index e9eebb736..e9eebb736 100644
--- a/caps/tests/mochitest/test_bug995943.xul
+++ b/system/security/script/tests/mochitest/test_bug995943.xul
diff --git a/caps/tests/mochitest/test_disableScript.xul b/system/security/script/tests/mochitest/test_disableScript.xul
index cef5f401a..cef5f401a 100644
--- a/caps/tests/mochitest/test_disableScript.xul
+++ b/system/security/script/tests/mochitest/test_disableScript.xul
diff --git a/caps/tests/mochitest/test_disallowInheritPrincipal.html b/system/security/script/tests/mochitest/test_disallowInheritPrincipal.html
index ec59bec3c..ec59bec3c 100644
--- a/caps/tests/mochitest/test_disallowInheritPrincipal.html
+++ b/system/security/script/tests/mochitest/test_disallowInheritPrincipal.html
diff --git a/caps/tests/mochitest/test_extensionURL.html b/system/security/script/tests/mochitest/test_extensionURL.html
index 315c47321..315c47321 100644
--- a/caps/tests/mochitest/test_extensionURL.html
+++ b/system/security/script/tests/mochitest/test_extensionURL.html
diff --git a/caps/tests/unit/test_origin.js b/system/security/script/tests/unit/test_origin.js
index 0fa125b61..0fa125b61 100644
--- a/caps/tests/unit/test_origin.js
+++ b/system/security/script/tests/unit/test_origin.js
diff --git a/caps/tests/unit/xpcshell.ini b/system/security/script/tests/unit/xpcshell.ini
index c06a6b4e9..c06a6b4e9 100644
--- a/caps/tests/unit/xpcshell.ini
+++ b/system/security/script/tests/unit/xpcshell.ini
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 2ac08e1f5..db3cdf8be 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -6,13 +6,6 @@
 DIRS += ['/libs']
 
 DIRS += [
-    # Depends on NSS and NSPR
-    '/security/certverifier',
-    # Depends on certverifier
-    '/security/apps',
-]
-
-DIRS += [
     '/config/external/freetype2',
     '/xpcom',
     '/intl',
@@ -57,7 +50,6 @@ if CONFIG['ENABLE_TESTS']:
 
 DIRS += [
     '/testing/gtest',
-    '/caps',
     '/image',
     '/dom',
     '/editor',
@@ -88,7 +80,6 @@ if CONFIG['MOZ_SPELLCHECK']:
     DIRS += ['/extensions/spellcheck']
 
 DIRS += [
-    '/security/manager',
     '/toolkit',
 ]
 
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index e5975b54a..7bad4de8a 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -61,7 +61,7 @@ include ../../libs/libpng/crashtests/crashtests.list
 
 include ../../netwerk/test/crashtests/crashtests.list
 
-include ../../security/manager/ssl/crashtests/crashtests.list
+include ../../system/security/manager/ssl/crashtests/crashtests.list
 
 include ../../layout/view/crashtests/crashtests.list
 
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index b09608eba..381cd148f 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -68,7 +68,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '../build',
-    '/caps',
+    '/system/security/script',
     '/tools/profiler',
 ]