Bug 1164714 - Move and flatten security/manager/boot/{public,src}/ into security/manager/ssl/. r=keeler
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Tue, 26 May 2015 10:31:25 -0700
changeset 278284 0c1cdda7c32391636dd1d4ea23d00c4b53f04cfe
parent 278283 ff4f7f2aabb147682823177dcfa80a12b0ecb759
child 278285 5b03693cc958e814ac5df077a4e02f7a02e07cdc
push id897
push userjlund@mozilla.com
push dateMon, 14 Sep 2015 18:56:12 +0000
treeherdermozilla-release@9411e2d2b214 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1164714
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1164714 - Move and flatten security/manager/boot/{public,src}/ into security/manager/ssl/. r=keeler
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
security/certverifier/moz.build
security/manager/boot/moz.build
security/manager/boot/public/moz.build
security/manager/boot/public/nsIBufEntropyCollector.idl
security/manager/boot/public/nsICertBlocklist.idl
security/manager/boot/public/nsISSLStatusProvider.idl
security/manager/boot/public/nsISecurityUITelemetry.idl
security/manager/boot/src/CertBlocklist.cpp
security/manager/boot/src/CertBlocklist.h
security/manager/boot/src/DataStorage.cpp
security/manager/boot/src/DataStorage.h
security/manager/boot/src/PublicKeyPinningService.cpp
security/manager/boot/src/PublicKeyPinningService.h
security/manager/boot/src/RootCertificateTelemetryUtils.cpp
security/manager/boot/src/RootCertificateTelemetryUtils.h
security/manager/boot/src/RootHashes.inc
security/manager/boot/src/StaticHPKPins.errors
security/manager/boot/src/StaticHPKPins.h
security/manager/boot/src/moz.build
security/manager/boot/src/nsBOOTModule.cpp
security/manager/boot/src/nsEntropyCollector.cpp
security/manager/boot/src/nsEntropyCollector.h
security/manager/boot/src/nsSTSPreloadList.errors
security/manager/boot/src/nsSTSPreloadList.inc
security/manager/boot/src/nsSecureBrowserUIImpl.cpp
security/manager/boot/src/nsSecureBrowserUIImpl.h
security/manager/boot/src/nsSecurityHeaderParser.cpp
security/manager/boot/src/nsSecurityHeaderParser.h
security/manager/boot/src/nsSiteSecurityService.cpp
security/manager/boot/src/nsSiteSecurityService.h
security/manager/moz.build
security/manager/ssl/CertBlocklist.cpp
security/manager/ssl/CertBlocklist.h
security/manager/ssl/DataStorage.cpp
security/manager/ssl/DataStorage.h
security/manager/ssl/PublicKeyPinningService.cpp
security/manager/ssl/PublicKeyPinningService.h
security/manager/ssl/RootCertificateTelemetryUtils.cpp
security/manager/ssl/RootCertificateTelemetryUtils.h
security/manager/ssl/RootHashes.inc
security/manager/ssl/StaticHPKPins.errors
security/manager/ssl/StaticHPKPins.h
security/manager/ssl/moz.build
security/manager/ssl/nsCrypto.cpp
security/manager/ssl/nsEntropyCollector.cpp
security/manager/ssl/nsEntropyCollector.h
security/manager/ssl/nsIBufEntropyCollector.idl
security/manager/ssl/nsICertBlocklist.idl
security/manager/ssl/nsISSLStatusProvider.idl
security/manager/ssl/nsISecurityUITelemetry.idl
security/manager/ssl/nsNSSIOLayer.cpp
security/manager/ssl/nsNSSModule.cpp
security/manager/ssl/nsSTSPreloadList.errors
security/manager/ssl/nsSTSPreloadList.inc
security/manager/ssl/nsSecureBrowserUIImpl.cpp
security/manager/ssl/nsSecureBrowserUIImpl.h
security/manager/ssl/nsSecurityHeaderParser.cpp
security/manager/ssl/nsSecurityHeaderParser.h
security/manager/ssl/nsSiteSecurityService.cpp
security/manager/ssl/nsSiteSecurityService.h
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -815,17 +815,16 @@
 ; svg
 @RESPATH@/res/svg.css
 @RESPATH@/components/dom_svg.xpt
 @RESPATH@/components/dom_smil.xpt
 
 ; [Personal Security Manager]
 ;
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-@RESPATH@/components/pipboot.xpt
 @RESPATH@/components/pipnss.xpt
 @RESPATH@/components/pippki.xpt
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -795,17 +795,16 @@
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
 @RESPATH@/chrome/pippki@JAREXT@
 @RESPATH@/chrome/pippki.manifest
-@RESPATH@/components/pipboot.xpt
 @RESPATH@/components/pipnss.xpt
 @RESPATH@/components/pippki.xpt
 
 ; For process sandboxing
 #if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
 #if defined(WOW_HELPER)
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -17,17 +17,16 @@ UNIFIED_SOURCES += [
 ]
 
 if not CONFIG['NSS_NO_EV_CERTS']:
     UNIFIED_SOURCES += [
         'ExtendedValidation.cpp',
     ]
 
 LOCAL_INCLUDES += [
-    '/security/manager/boot/src',
     '/security/manager/ssl',
     '/security/pkix/include',
 ]
 
 DIRS += [
     '../pkix',
 ]
 
deleted file mode 100644
--- a/security/manager/boot/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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 += ['public', 'src']
-
deleted file mode 100644
--- a/security/manager/boot/public/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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 += [
-    'nsIBufEntropyCollector.idl',
-    'nsICertBlocklist.idl',
-    'nsISecurityUITelemetry.idl',
-    'nsISSLStatusProvider.idl',
-]
-
-XPIDL_MODULE = 'pipboot'
-
deleted file mode 100644
--- a/security/manager/boot/src/moz.build
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-EXPORTS.mozilla += [
-    'DataStorage.h',
-]
-
-UNIFIED_SOURCES += [
-    'CertBlocklist.cpp',
-    'DataStorage.cpp',
-    'nsBOOTModule.cpp',
-    'nsEntropyCollector.cpp',
-    'nsSecureBrowserUIImpl.cpp',
-    'nsSecurityHeaderParser.cpp',
-    'nsSiteSecurityService.cpp',
-    'PublicKeyPinningService.cpp',
-    'RootCertificateTelemetryUtils.cpp',
-]
-
-LOCAL_INCLUDES += [
-    '../../../pkix/include',
-]
-
-GENERATED_INCLUDES += [
-    '/dist/public/nss',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/security/manager/boot/src/nsBOOTModule.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#include "mozilla/ModuleUtils.h"
-
-#include "CertBlocklist.h"
-#include "nsEntropyCollector.h"
-#include "nsSecureBrowserUIImpl.h"
-#include "nsSiteSecurityService.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(CertBlocklist, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSiteSecurityService, Init)
-
-NS_DEFINE_NAMED_CID(NS_ENTROPYCOLLECTOR_CID);
-NS_DEFINE_NAMED_CID(NS_SECURE_BROWSER_UI_CID);
-NS_DEFINE_NAMED_CID(NS_SITE_SECURITY_SERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_CERT_BLOCKLIST_CID);
-
-static const mozilla::Module::CIDEntry kBOOTCIDs[] = {
-  { &kNS_ENTROPYCOLLECTOR_CID, false, nullptr, nsEntropyCollectorConstructor },
-  { &kNS_SECURE_BROWSER_UI_CID, false, nullptr, nsSecureBrowserUIImplConstructor },
-  { &kNS_SITE_SECURITY_SERVICE_CID, false, nullptr, nsSiteSecurityServiceConstructor },
-  { &kNS_CERT_BLOCKLIST_CID, false, nullptr, CertBlocklistConstructor},
-  { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kBOOTContracts[] = {
-  { NS_ENTROPYCOLLECTOR_CONTRACTID, &kNS_ENTROPYCOLLECTOR_CID },
-  { NS_SECURE_BROWSER_UI_CONTRACTID, &kNS_SECURE_BROWSER_UI_CID },
-  { NS_SSSERVICE_CONTRACTID, &kNS_SITE_SECURITY_SERVICE_CID },
-  { NS_CERTBLOCKLIST_CONTRACTID, &kNS_CERT_BLOCKLIST_CID },
-  { nullptr }
-};
-
-static const mozilla::Module kBootModule = {
-  mozilla::Module::kVersion,
-  kBOOTCIDs,
-  kBOOTContracts
-};
-
-NSMODULE_DEFN(BOOT) = &kBootModule;
--- a/security/manager/moz.build
+++ b/security/manager/moz.build
@@ -1,10 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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 += ['boot', 'ssl', 'locales']
+DIRS += ['ssl', 'locales']
 
 if CONFIG['MOZ_XUL'] and CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
     DIRS += ['pki']
rename from security/manager/boot/src/CertBlocklist.cpp
rename to security/manager/ssl/CertBlocklist.cpp
rename from security/manager/boot/src/CertBlocklist.h
rename to security/manager/ssl/CertBlocklist.h
rename from security/manager/boot/src/DataStorage.cpp
rename to security/manager/ssl/DataStorage.cpp
rename from security/manager/boot/src/DataStorage.h
rename to security/manager/ssl/DataStorage.h
rename from security/manager/boot/src/PublicKeyPinningService.cpp
rename to security/manager/ssl/PublicKeyPinningService.cpp
rename from security/manager/boot/src/PublicKeyPinningService.h
rename to security/manager/ssl/PublicKeyPinningService.h
rename from security/manager/boot/src/RootCertificateTelemetryUtils.cpp
rename to security/manager/ssl/RootCertificateTelemetryUtils.cpp
rename from security/manager/boot/src/RootCertificateTelemetryUtils.h
rename to security/manager/ssl/RootCertificateTelemetryUtils.h
rename from security/manager/boot/src/RootHashes.inc
rename to security/manager/ssl/RootHashes.inc
rename from security/manager/boot/src/StaticHPKPins.errors
rename to security/manager/ssl/StaticHPKPins.errors
rename from security/manager/boot/src/StaticHPKPins.h
rename to security/manager/ssl/StaticHPKPins.h
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -7,33 +7,37 @@
 TEST_DIRS += [ 'tests' ]
 
 XPIDL_SOURCES += [
     'nsIASN1Object.idl',
     'nsIASN1PrintableItem.idl',
     'nsIASN1Sequence.idl',
     'nsIAssociatedContentSecurity.idl',
     'nsIBadCertListener2.idl',
+    'nsIBufEntropyCollector.idl',
+    'nsICertBlocklist.idl',
     'nsICertificateDialogs.idl',
     'nsICertOverrideService.idl',
     'nsICertPickDialogs.idl',
     'nsIClientAuthDialogs.idl',
     'nsIDataSignatureVerifier.idl',
     'nsIGenKeypairInfoDlg.idl',
     'nsIKeygenThread.idl',
     'nsIKeyModule.idl',
     'nsINSSVersion.idl',
     'nsIPK11Token.idl',
     'nsIPK11TokenDB.idl',
     'nsIPKCS11.idl',
     'nsIPKCS11Module.idl',
     'nsIPKCS11ModuleDB.idl',
     'nsIPKCS11Slot.idl',
     'nsIProtectedAuthThread.idl',
+    'nsISecurityUITelemetry.idl',
     'nsISSLStatus.idl',
+    'nsISSLStatusProvider.idl',
     'nsITokenDialogs.idl',
     'nsITokenPasswordDialogs.idl',
     'nsIUserCertPicker.idl',
     'nsIX509Cert.idl',
     'nsIX509CertDB.idl',
     'nsIX509CertList.idl',
     'nsIX509CertValidity.idl',
 ]
@@ -56,32 +60,36 @@ EXPORTS += [
     'nsNSSShutDown.h',
     'nsRandomGenerator.h',
     'NSSErrorsService.h',
     'ScopedNSSTypes.h',
     'SharedCertVerifier.h',
 ]
 
 EXPORTS.mozilla += [
+    'DataStorage.h',
     'PublicSSL.h',
 ]
 
 EXPORTS.mozilla.psm += [
     'PSMContentListener.h',
 ]
 
 UNIFIED_SOURCES += [
+    'CertBlocklist.cpp',
     'CryptoTask.cpp',
+    'DataStorage.cpp',
     'nsCertOverrideService.cpp',
     'nsCertPicker.cpp',
     'nsCertVerificationThread.cpp',
     'nsClientAuthRemember.cpp',
     'nsCrypto.cpp',
     'nsCryptoHash.cpp',
     'nsDataSignatureVerifier.cpp',
+    'nsEntropyCollector.cpp',
     'nsKeygenHandler.cpp',
     'nsKeygenHandlerContent.cpp',
     'nsKeygenThread.cpp',
     'nsKeyModule.cpp',
     'nsNSSASN1Object.cpp',
     'nsNSSCallbacks.cpp',
     'nsNSSCertHelper.cpp',
     'nsNSSCertificate.cpp',
@@ -97,41 +105,42 @@ UNIFIED_SOURCES += [
     'nsNTLMAuthModule.cpp',
     'nsPK11TokenDB.cpp',
     'nsPKCS11Slot.cpp',
     'nsPKCS12Blob.cpp',
     'nsProtectedAuthThread.cpp',
     'nsPSMBackgroundThread.cpp',
     'nsRandomGenerator.cpp',
     'nsSDR.cpp',
+    'nsSecureBrowserUIImpl.cpp',
+    'nsSecurityHeaderParser.cpp',
     'NSSErrorsService.cpp',
+    'nsSiteSecurityService.cpp',
     'nsSSLSocketProvider.cpp',
     'nsSSLStatus.cpp',
     'nsTLSSocketProvider.cpp',
     'nsUsageArrayHelper.cpp',
     'PSMContentListener.cpp',
     'PSMRunnable.cpp',
+    'PublicKeyPinningService.cpp',
+    'RootCertificateTelemetryUtils.cpp',
     'SharedSSLState.cpp',
     'SSLServerCertVerification.cpp',
     'TransportSecurityInfo.cpp',
 ]
 
 # nsNSSCertificateDB.cpp needs to include nscert.h before everything else.
 SOURCES += [
     'nsNSSCertificateDB.cpp',
 ]
 
 IPDL_SOURCES += [
     'PPSMContentDownloader.ipdl',
 ]
 
-LOCAL_INCLUDES += [
-    '/security/manager/boot/src',
-]
-
 if not CONFIG['MOZ_NO_SMART_CARDS']:
     UNIFIED_SOURCES += [
         'nsSmartCardMonitor.cpp',
     ]
 
 if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'nsCertTree.cpp',
@@ -146,16 +155,20 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/base',
     '/security/certverifier',
     '/security/pkix/include',
 ]
 
+GENERATED_INCLUDES += [
+    '/dist/public/nss',
+]
+
 if CONFIG['NSS_DISABLE_DBM']:
     DEFINES['NSS_DISABLE_DBM'] = '1'
 
 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
 DEFINES['NSS_ENABLE_ECC'] = 'True'
 for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
--- a/security/manager/ssl/nsCrypto.cpp
+++ b/security/manager/ssl/nsCrypto.cpp
@@ -46,17 +46,17 @@ nsPkcs11::DeleteModule(const nsAString& 
     return NS_ERROR_INVALID_ARG;
   }
 
   NS_ConvertUTF16toUTF8 moduleName(aModuleName);
   // Introduce additional scope for module so all references to it are released
   // before we call SECMOD_DeleteModule, below.
 #ifndef MOZ_NO_SMART_CARDS
   {
-    ScopedSECMODModule module(SECMOD_FindModule(moduleName.get()));
+    mozilla::ScopedSECMODModule module(SECMOD_FindModule(moduleName.get()));
     if (!module) {
       return NS_ERROR_FAILURE;
     }
     nsCOMPtr<nsINSSComponent> nssComponent(
       do_GetService(PSM_COMPONENT_CONTRACTID));
     nssComponent->ShutdownSmartCardThread(module.get());
   }
 #endif
@@ -95,17 +95,17 @@ nsPkcs11::AddModule(const nsAString& aMo
   uint32_t cipherFlags = SECMOD_PubCipherFlagstoInternal(aCipherFlags);
   SECStatus srv = SECMOD_AddNewModule(moduleName.get(), fullPath.get(),
                                       mechFlags, cipherFlags);
   if (srv != SECSuccess) {
     return NS_ERROR_FAILURE;
   }
 
 #ifndef MOZ_NO_SMART_CARDS
-  ScopedSECMODModule module(SECMOD_FindModule(moduleName.get()));
+  mozilla::ScopedSECMODModule module(SECMOD_FindModule(moduleName.get()));
   if (!module) {
     return NS_ERROR_FAILURE;
   }
   nsCOMPtr<nsINSSComponent> nssComponent(
     do_GetService(PSM_COMPONENT_CONTRACTID));
   nssComponent->LaunchSmartCardThread(module.get());
 #endif
 
rename from security/manager/boot/src/nsEntropyCollector.cpp
rename to security/manager/ssl/nsEntropyCollector.cpp
rename from security/manager/boot/src/nsEntropyCollector.h
rename to security/manager/ssl/nsEntropyCollector.h
rename from security/manager/boot/public/nsIBufEntropyCollector.idl
rename to security/manager/ssl/nsIBufEntropyCollector.idl
rename from security/manager/boot/public/nsICertBlocklist.idl
rename to security/manager/ssl/nsICertBlocklist.idl
rename from security/manager/boot/public/nsISSLStatusProvider.idl
rename to security/manager/ssl/nsISSLStatusProvider.idl
rename from security/manager/boot/public/nsISecurityUITelemetry.idl
rename to security/manager/ssl/nsISecurityUITelemetry.idl
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/nsNSSIOLayer.cpp
@@ -14,16 +14,17 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Telemetry.h"
 
 #include "mozilla/Logging.h"
 #include "prmem.h"
 #include "prnetdb.h"
 #include "nsIPrefService.h"
 #include "nsIClientAuthDialogs.h"
+#include "nsIWebProgressListener.h"
 #include "nsClientAuthRemember.h"
 
 #include "nsNetUtil.h"
 #include "nsPrintfCString.h"
 #include "SSLServerCertVerification.h"
 #include "nsNSSCertHelper.h"
 
 #include "nsCharSeparatedTokenizer.h"
--- a/security/manager/ssl/nsNSSModule.cpp
+++ b/security/manager/ssl/nsNSSModule.cpp
@@ -33,16 +33,20 @@
 #include "nsKeyModule.h"
 #include "nsDataSignatureVerifier.h"
 #include "nsCertOverrideService.h"
 #include "nsRandomGenerator.h"
 #include "nsSSLStatus.h"
 #include "TransportSecurityInfo.h"
 #include "NSSErrorsService.h"
 #include "nsNSSVersion.h"
+#include "CertBlocklist.h"
+#include "nsEntropyCollector.h"
+#include "nsSecureBrowserUIImpl.h"
+#include "nsSiteSecurityService.h"
 
 #include "nsXULAppAPI.h"
 
 #include "PSMContentListener.h"
 
 #define NS_IS_PROCESS_DEFAULT                                                 \
     (GeckoProcessType_Default == XRE_GetProcessType())
 
@@ -210,16 +214,20 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEn
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsRandomGenerator)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsSSLStatus)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, TransportSecurityInfo)
 
 typedef mozilla::psm::NSSErrorsService NSSErrorsService;
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NSSErrorsService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsNSSVersion)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCertOverrideService, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(CertBlocklist, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSiteSecurityService, Init)
 
 NS_DEFINE_NAMED_CID(NS_NSSCOMPONENT_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_STARTTLSSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_SDR_CID);
 NS_DEFINE_NAMED_CID(NS_PK11TOKENDB_CID);
 NS_DEFINE_NAMED_CID(NS_PKCS11MODULEDB_CID);
 NS_DEFINE_NAMED_CID(NS_PSMCONTENTLISTEN_CID);
@@ -239,16 +247,20 @@ NS_DEFINE_NAMED_CID(NS_KEYMODULEOBJECT_C
 NS_DEFINE_NAMED_CID(NS_KEYMODULEOBJECTFACTORY_CID);
 NS_DEFINE_NAMED_CID(NS_DATASIGNATUREVERIFIER_CID);
 NS_DEFINE_NAMED_CID(NS_CERTOVERRIDE_CID);
 NS_DEFINE_NAMED_CID(NS_RANDOMGENERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSTATUS_CID);
 NS_DEFINE_NAMED_CID(TRANSPORTSECURITYINFO_CID);
 NS_DEFINE_NAMED_CID(NS_NSSERRORSSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_NSSVERSION_CID);
+NS_DEFINE_NAMED_CID(NS_ENTROPYCOLLECTOR_CID);
+NS_DEFINE_NAMED_CID(NS_SECURE_BROWSER_UI_CID);
+NS_DEFINE_NAMED_CID(NS_SITE_SECURITY_SERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_CERT_BLOCKLIST_CID);
 
 static const mozilla::Module::CIDEntry kNSSCIDs[] = {
   { &kNS_NSSCOMPONENT_CID, false, nullptr, nsNSSComponentConstructor },
   { &kNS_SSLSOCKETPROVIDER_CID, false, nullptr, nsSSLSocketProviderConstructor },
   { &kNS_STARTTLSSOCKETPROVIDER_CID, false, nullptr, nsTLSSocketProviderConstructor },
   { &kNS_SDR_CID, false, nullptr, nsSecretDecoderRingConstructor },
   { &kNS_PK11TOKENDB_CID, false, nullptr, nsPK11TokenDBConstructor },
   { &kNS_PKCS11MODULEDB_CID, false, nullptr, nsPKCS11ModuleDBConstructor },
@@ -269,16 +281,20 @@ static const mozilla::Module::CIDEntry k
   { &kNS_KEYMODULEOBJECTFACTORY_CID, false, nullptr, nsKeyObjectFactoryConstructor },
   { &kNS_DATASIGNATUREVERIFIER_CID, false, nullptr, nsDataSignatureVerifierConstructor },
   { &kNS_CERTOVERRIDE_CID, false, nullptr, nsCertOverrideServiceConstructor },
   { &kNS_RANDOMGENERATOR_CID, false, nullptr, nsRandomGeneratorConstructor },
   { &kNS_SSLSTATUS_CID, false, nullptr, nsSSLStatusConstructor },
   { &kTRANSPORTSECURITYINFO_CID, false, nullptr, TransportSecurityInfoConstructor },
   { &kNS_NSSERRORSSERVICE_CID, false, nullptr, NSSErrorsServiceConstructor },
   { &kNS_NSSVERSION_CID, false, nullptr, nsNSSVersionConstructor },
+  { &kNS_ENTROPYCOLLECTOR_CID, false, nullptr, nsEntropyCollectorConstructor },
+  { &kNS_SECURE_BROWSER_UI_CID, false, nullptr, nsSecureBrowserUIImplConstructor },
+  { &kNS_SITE_SECURITY_SERVICE_CID, false, nullptr, nsSiteSecurityServiceConstructor },
+  { &kNS_CERT_BLOCKLIST_CID, false, nullptr, CertBlocklistConstructor},
   { nullptr }
 };
 
 static const mozilla::Module::ContractIDEntry kNSSContracts[] = {
   { PSM_COMPONENT_CONTRACTID, &kNS_NSSCOMPONENT_CID },
   { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSERRORSSERVICE_CID },
   { NS_NSSVERSION_CONTRACTID, &kNS_NSSVERSION_CID },
   { NS_SSLSOCKETPROVIDER_CONTRACTID, &kNS_SSLSOCKETPROVIDER_CID },
@@ -300,16 +316,20 @@ static const mozilla::Module::ContractID
   { "@mozilla.org/uriloader/psm-external-content-listener;1", &kNS_PSMCONTENTLISTEN_CID },
   { NS_CRYPTO_FIPSINFO_SERVICE_CONTRACTID, &kNS_PKCS11MODULEDB_CID },
   { NS_NTLMAUTHMODULE_CONTRACTID, &kNS_NTLMAUTHMODULE_CID },
   { NS_KEYMODULEOBJECT_CONTRACTID, &kNS_KEYMODULEOBJECT_CID },
   { NS_KEYMODULEOBJECTFACTORY_CONTRACTID, &kNS_KEYMODULEOBJECTFACTORY_CID },
   { NS_DATASIGNATUREVERIFIER_CONTRACTID, &kNS_DATASIGNATUREVERIFIER_CID },
   { NS_CERTOVERRIDE_CONTRACTID, &kNS_CERTOVERRIDE_CID },
   { NS_RANDOMGENERATOR_CONTRACTID, &kNS_RANDOMGENERATOR_CID },
+  { NS_ENTROPYCOLLECTOR_CONTRACTID, &kNS_ENTROPYCOLLECTOR_CID },
+  { NS_SECURE_BROWSER_UI_CONTRACTID, &kNS_SECURE_BROWSER_UI_CID },
+  { NS_SSSERVICE_CONTRACTID, &kNS_SITE_SECURITY_SERVICE_CID },
+  { NS_CERTBLOCKLIST_CONTRACTID, &kNS_CERT_BLOCKLIST_CID },
   { nullptr }
 };
 
 static const mozilla::Module::CategoryEntry kNSSCategories[] = {
   { NS_CONTENT_LISTENER_CATEGORYMANAGER_ENTRY, "application/x-x509-ca-cert", "@mozilla.org/uriloader/psm-external-content-listener;1" },
   { NS_CONTENT_LISTENER_CATEGORYMANAGER_ENTRY, "application/x-x509-server-cert", "@mozilla.org/uriloader/psm-external-content-listener;1" },
   { NS_CONTENT_LISTENER_CATEGORYMANAGER_ENTRY, "application/x-x509-user-cert", "@mozilla.org/uriloader/psm-external-content-listener;1" },
   { NS_CONTENT_LISTENER_CATEGORYMANAGER_ENTRY, "application/x-x509-email-cert", "@mozilla.org/uriloader/psm-external-content-listener;1" },
rename from security/manager/boot/src/nsSTSPreloadList.errors
rename to security/manager/ssl/nsSTSPreloadList.errors
rename from security/manager/boot/src/nsSTSPreloadList.inc
rename to security/manager/ssl/nsSTSPreloadList.inc
rename from security/manager/boot/src/nsSecureBrowserUIImpl.cpp
rename to security/manager/ssl/nsSecureBrowserUIImpl.cpp
rename from security/manager/boot/src/nsSecureBrowserUIImpl.h
rename to security/manager/ssl/nsSecureBrowserUIImpl.h
rename from security/manager/boot/src/nsSecurityHeaderParser.cpp
rename to security/manager/ssl/nsSecurityHeaderParser.cpp
rename from security/manager/boot/src/nsSecurityHeaderParser.h
rename to security/manager/ssl/nsSecurityHeaderParser.h
rename from security/manager/boot/src/nsSiteSecurityService.cpp
rename to security/manager/ssl/nsSiteSecurityService.cpp
rename from security/manager/boot/src/nsSiteSecurityService.h
rename to security/manager/ssl/nsSiteSecurityService.h