Bug 1256302 - Remove CertVerifier::InitCertVerifierLog(). r=jcj
authorCykesiopka <cykesiopka.bmo@gmail.com>
Fri, 02 Sep 2016 10:45:47 +0200
changeset 312389 f615741c86eed245173be02078053f4801403ba4
parent 312388 3b722968c9d4c02152b787c70782971586b6c0fd
child 312390 8fdff7ffdcee621fec75557a8e95eefc78624f9d
push id20447
push userkwierso@gmail.com
push dateFri, 02 Sep 2016 20:36:44 +0000
treeherderfx-team@969397f22187 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcj
bugs1256302
milestone51.0a1
Bug 1256302 - Remove CertVerifier::InitCertVerifierLog(). r=jcj
security/certverifier/CertVerifier.cpp
security/certverifier/CertVerifier.h
security/manager/ssl/nsNSSComponent.cpp
security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
--- a/security/certverifier/CertVerifier.cpp
+++ b/security/certverifier/CertVerifier.cpp
@@ -52,21 +52,16 @@ CertVerifier::CertVerifier(OcspDownloadC
   , mNetscapeStepUpPolicy(netscapeStepUpPolicy)
 {
 }
 
 CertVerifier::~CertVerifier()
 {
 }
 
-void
-InitCertVerifierLog()
-{
-}
-
 Result
 IsCertChainRootBuiltInRoot(const UniqueCERTCertList& chain, bool& result)
 {
   if (!chain || CERT_LIST_EMPTY(chain)) {
     return Result::FATAL_ERROR_LIBRARY_FAILURE;
   }
   CERTCertListNode* rootNode = CERT_LIST_TAIL(chain);
   if (!rootNode) {
--- a/security/certverifier/CertVerifier.h
+++ b/security/certverifier/CertVerifier.h
@@ -145,17 +145,16 @@ private:
 
   // Returns true if the configured SHA1 mode is more restrictive than the given
   // mode. SHA1Mode::Forbidden is more restrictive than any other mode except
   // Forbidden. Next is Before2016, then ImportedRoot, then Allowed.
   // (A mode is never more restrictive than itself.)
   bool SHA1ModeMoreRestrictiveThanGivenMode(SHA1Mode mode);
 };
 
-void InitCertVerifierLog();
 mozilla::pkix::Result IsCertBuiltInRoot(CERTCertificate* cert, bool& result);
 mozilla::pkix::Result CertListContainsExpectedKeys(
   const CERTCertList* certList, const char* hostname, mozilla::pkix::Time time,
   CertVerifier::PinningMode pinningMode);
 
 } } // namespace mozilla::psm
 
 #endif // CertVerifier_h
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -1739,18 +1739,16 @@ nsNSSComponent::InitializeNSS()
   SSL_OptionSetDefault(SSL_V2_COMPATIBLE_HELLO, false);
 
   rv = setEnabledTLSVersions();
   if (NS_FAILED(rv)) {
     return NS_ERROR_UNEXPECTED;
   }
 
   DisableMD5();
-  // Initialize the certverifier log before calling any functions that library.
-  InitCertVerifierLog();
   LoadLoadableRoots();
 
   MaybeEnableFamilySafetyCompatibility();
   MaybeImportEnterpriseRoots();
 
   ConfigureTLSSessionIdentifiers();
 
   bool requireSafeNegotiation =
--- a/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
+++ b/security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
@@ -34,17 +34,16 @@ const int MaxCacheEntries = 1024;
 class psm_OCSPCacheTest : public ::testing::Test
 {
 protected:
   psm_OCSPCacheTest() : now(Now()) { }
 
   static void SetUpTestCase()
   {
     NSS_NoDB_Init(nullptr);
-    mozilla::psm::InitCertVerifierLog();
   }
 
   const Time now;
   mozilla::psm::OCSPCache cache;
 };
 
 static void
 PutAndGet(OCSPCache& cache, const CertID& certID, Result result,