equal
deleted
inserted
replaced
74 +#endif |
74 +#endif |
75 + |
75 + |
76 #include "nsNSSComponent.h" |
76 #include "nsNSSComponent.h" |
77 |
77 |
78 #include "CertVerifier.h" |
78 #include "CertVerifier.h" |
|
79 #include "mozilla/Telemetry.h" |
79 #include "nsCertVerificationThread.h" |
80 #include "nsCertVerificationThread.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
81 #include "nsAppDirectoryServiceDefs.h" |
81 #include "nsComponentManagerUtils.h" |
82 #include "nsComponentManagerUtils.h" |
82 #include "nsDirectoryServiceDefs.h" |
83 #include "nsDirectoryServiceDefs.h" |
83 #include "nsICertOverrideService.h" |
84 @@ -1263,18 +1270,35 @@ nsNSSComponent::InitializeNSS(bool showW |
84 @@ -1254,18 +1261,35 @@ nsNSSComponent::InitializeNSS(bool showW |
|
85 ConfigureInternalPKCS11Token(); |
85 ConfigureInternalPKCS11Token(); |
86 |
86 |
87 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
87 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
88 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
88 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
89 // later. It also allows us to work around a bug in the system NSS in |
89 // later. It also allows us to work around a bug in the system NSS in |