Move the NSS functions out of CertDatabase into a new NSSCertDatabase class.

net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp

  /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 44 matching lines @@
  * If we're using an older version, rename it ourselves.
  */
 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
 #endif
 
 namespace mozilla_security_manager {
 
 // Based on nsNSSCertificateDB::handleCACertDownload, minus the UI bits.
 bool ImportCACerts(const net::CertificateList& certificates,
                    net::X509Certificate* root,
-                   net::CertDatabase::TrustBits trustBits,
-                   net::CertDatabase::ImportCertFailureList* not_imported) {
+                   net::NSSCertDatabase::TrustBits trustBits,
+                   net::NSSCertDatabase::ImportCertFailureList* not_imported) {
   if (certificates.empty() || !root)
     return false;
 
   crypto::ScopedPK11Slot slot(crypto::GetPublicNSSKeySlot());
   if (!slot.get()) {
     LOG(ERROR) << "Couldn't get internal key slot!";
     return false;
   }
 
   // Mozilla had some code here to check if a perm version of the cert exists
   // already and use that, but CERT_NewTempCertificate actually does that
   // itself, so we skip it here.
 
   if (!CERT_IsCACert(root->os_cert_handle(), NULL)) {
-    not_imported->push_back(net::CertDatabase::ImportCertFailure(
+    not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
         root, net::ERR_IMPORT_CA_CERT_NOT_CA));
   } else if (root->os_cert_handle()->isperm) {
     // Mozilla just returns here, but we continue in case there are other certs
     // in the list which aren't already imported.
     // TODO(mattm): should we set/add trust if it differs from the present
     // settings?
-    not_imported->push_back(net::CertDatabase::ImportCertFailure(
+    not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
         root, net::ERR_IMPORT_CERT_ALREADY_EXISTS));
   } else {
     // Mozilla uses CERT_AddTempCertToPerm, however it is privately exported,
     // and it doesn't take the slot as an argument either.  Instead, we use
     // PK11_ImportCert and CERT_ChangeCertTrust.
     SECStatus srv = PK11_ImportCert(
         slot.get(),
         root->os_cert_handle(),
         CK_INVALID_HANDLE,
         root->GetDefaultNickname(net::CA_CERT).c_str(),
@@ skipping 16 matching lines @@
   for (size_t i = 0; i < certificates.size(); i++) {
     const scoped_refptr<net::X509Certificate>& cert = certificates[i];
     if (cert == root) {
       // we already processed that one
       continue;
     }
 
     // Mozilla uses CERT_FilterCertListByUsage(certList, certUsageAnyCA,
     // PR_TRUE).  Afaict, checking !CERT_IsCACert on each cert is equivalent.
     if (!CERT_IsCACert(cert->os_cert_handle(), NULL)) {
-      not_imported->push_back(net::CertDatabase::ImportCertFailure(
+      not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
           cert, net::ERR_IMPORT_CA_CERT_NOT_CA));
       VLOG(1) << "skipping cert (non-ca)";
       continue;
     }
 
     if (cert->os_cert_handle()->isperm) {
-      not_imported->push_back(net::CertDatabase::ImportCertFailure(
+      not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
           cert, net::ERR_IMPORT_CERT_ALREADY_EXISTS));
       VLOG(1) << "skipping cert (perm)";
       continue;
     }
 
     if (CERT_VerifyCert(CERT_GetDefaultCertDB(), cert->os_cert_handle(),
         PR_TRUE, certUsageVerifyCA, now, NULL, NULL) != SECSuccess) {
       // TODO(mattm): use better error code (map PORT_GetError to an appropriate
       // error value).  (maybe make MapSecurityError or MapCertErrorToCertStatus
       // public.)
-      not_imported->push_back(net::CertDatabase::ImportCertFailure(
+      not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
           cert, net::ERR_FAILED));
       VLOG(1) << "skipping cert (verify) " << PORT_GetError();
       continue;
     }
 
     // Mozilla uses CERT_ImportCerts, which doesn't take a slot arg.  We use
     // PK11_ImportCert instead.
     SECStatus srv = PK11_ImportCert(
         slot.get(),
         cert->os_cert_handle(),
         CK_INVALID_HANDLE,
         cert->GetDefaultNickname(net::CA_CERT).c_str(),
         PR_FALSE /* includeTrust (unused) */);
     if (srv != SECSuccess) {
       LOG(ERROR) << "PK11_ImportCert failed with error " << PORT_GetError();
       // TODO(mattm): Should we bail or continue on error here?  Mozilla doesn't
       // check error code at all.
-      not_imported->push_back(net::CertDatabase::ImportCertFailure(
+      not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
           cert, net::ERR_IMPORT_CA_CERT_FAILED));
     }
   }
 
   // Any errors importing individual certs will be in listed in |not_imported|.
   return true;
 }
 
 // Based on nsNSSCertificateDB::ImportServerCertificate.
-bool ImportServerCert(const net::CertificateList& certificates,
-                      net::CertDatabase::TrustBits trustBits,
-                      net::CertDatabase::ImportCertFailureList* not_imported) {
+bool ImportServerCert(
+    const net::CertificateList& certificates,
+    net::NSSCertDatabase::TrustBits trustBits,
+    net::NSSCertDatabase::ImportCertFailureList* not_imported) {
   if (certificates.empty())
     return false;
 
   crypto::ScopedPK11Slot slot(crypto::GetPublicNSSKeySlot());
   if (!slot.get()) {
     LOG(ERROR) << "Couldn't get internal key slot!";
     return false;
   }
 
   for (size_t i = 0; i < certificates.size(); ++i) {
     const scoped_refptr<net::X509Certificate>& cert = certificates[i];
 
     // Mozilla uses CERT_ImportCerts, which doesn't take a slot arg.  We use
     // PK11_ImportCert instead.
     SECStatus srv = PK11_ImportCert(
         slot.get(),
         cert->os_cert_handle(),
         CK_INVALID_HANDLE,
         cert->GetDefaultNickname(net::SERVER_CERT).c_str(),
         PR_FALSE /* includeTrust (unused) */);
     if (srv != SECSuccess) {
       LOG(ERROR) << "PK11_ImportCert failed with error " << PORT_GetError();
-      not_imported->push_back(net::CertDatabase::ImportCertFailure(
+      not_imported->push_back(net::NSSCertDatabase::ImportCertFailure(
           cert, net::ERR_IMPORT_SERVER_CERT_FAILED));
       continue;
     }
   }
 
   SetCertTrust(certificates[0].get(), net::SERVER_CERT, trustBits);
   // TODO(mattm): Report SetCertTrust result?  Putting in not_imported
   // wouldn't quite match up since it was imported...
 
   // Any errors importing individual certs will be in listed in |not_imported|.
   return true;
 }
 
 // Based on nsNSSCertificateDB::SetCertTrust.
 bool
 SetCertTrust(const net::X509Certificate* cert,
              net::CertType type,
-             net::CertDatabase::TrustBits trustBits)
+             net::NSSCertDatabase::TrustBits trustBits)
 {
-  const unsigned kSSLTrustBits = net::CertDatabase::TRUSTED_SSL |
-      net::CertDatabase::DISTRUSTED_SSL;
-  const unsigned kEmailTrustBits = net::CertDatabase::TRUSTED_EMAIL |
-      net::CertDatabase::DISTRUSTED_EMAIL;
-  const unsigned kObjSignTrustBits = net::CertDatabase::TRUSTED_OBJ_SIGN |
-      net::CertDatabase::DISTRUSTED_OBJ_SIGN;
+  const unsigned kSSLTrustBits = net::NSSCertDatabase::TRUSTED_SSL |
+      net::NSSCertDatabase::DISTRUSTED_SSL;
+  const unsigned kEmailTrustBits = net::NSSCertDatabase::TRUSTED_EMAIL |
+      net::NSSCertDatabase::DISTRUSTED_EMAIL;
+  const unsigned kObjSignTrustBits = net::NSSCertDatabase::TRUSTED_OBJ_SIGN |
+      net::NSSCertDatabase::DISTRUSTED_OBJ_SIGN;
   if ((trustBits & kSSLTrustBits) == kSSLTrustBits ||
       (trustBits & kEmailTrustBits) == kEmailTrustBits ||
       (trustBits & kObjSignTrustBits) == kObjSignTrustBits) {
     LOG(ERROR) << "SetCertTrust called with conflicting trust bits "
                << trustBits;
     NOTREACHED();
     return false;
   }
 
   SECStatus srv;
   CERTCertificate *nsscert = cert->os_cert_handle();
   if (type == net::CA_CERT) {
     // Note that we start with CERTDB_VALID_CA for default trust and explicit
     // trust, but explicitly distrusted usages will be set to
     // CERTDB_TERMINAL_RECORD only.
     CERTCertTrust trust = {CERTDB_VALID_CA, CERTDB_VALID_CA, CERTDB_VALID_CA};
 
-    if (trustBits & net::CertDatabase::DISTRUSTED_SSL)
+    if (trustBits & net::NSSCertDatabase::DISTRUSTED_SSL)
       trust.sslFlags = CERTDB_TERMINAL_RECORD;
-    else if (trustBits & net::CertDatabase::TRUSTED_SSL)
+    else if (trustBits & net::NSSCertDatabase::TRUSTED_SSL)
       trust.sslFlags |= CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA;
 
-    if (trustBits & net::CertDatabase::DISTRUSTED_EMAIL)
+    if (trustBits & net::NSSCertDatabase::DISTRUSTED_EMAIL)
       trust.emailFlags = CERTDB_TERMINAL_RECORD;
-    else if (trustBits & net::CertDatabase::TRUSTED_EMAIL)
+    else if (trustBits & net::NSSCertDatabase::TRUSTED_EMAIL)
       trust.emailFlags |= CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA;
 
-    if (trustBits & net::CertDatabase::DISTRUSTED_OBJ_SIGN)
+    if (trustBits & net::NSSCertDatabase::DISTRUSTED_OBJ_SIGN)
       trust.objectSigningFlags = CERTDB_TERMINAL_RECORD;
-    else if (trustBits & net::CertDatabase::TRUSTED_OBJ_SIGN)
+    else if (trustBits & net::NSSCertDatabase::TRUSTED_OBJ_SIGN)
       trust.objectSigningFlags |= CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA;
 
     srv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), nsscert, &trust);
   } else if (type == net::SERVER_CERT) {
     CERTCertTrust trust = {0};
     // We only modify the sslFlags, so copy the other flags.
     CERT_GetCertTrust(nsscert, &trust);
     trust.sslFlags = 0;
 
-    if (trustBits & net::CertDatabase::DISTRUSTED_SSL)
+    if (trustBits & net::NSSCertDatabase::DISTRUSTED_SSL)
       trust.sslFlags |= CERTDB_TERMINAL_RECORD;
-    else if (trustBits & net::CertDatabase::TRUSTED_SSL)
+    else if (trustBits & net::NSSCertDatabase::TRUSTED_SSL)
       trust.sslFlags |= CERTDB_TRUSTED | CERTDB_TERMINAL_RECORD;
 
     srv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), nsscert, &trust);
   } else {
     // ignore user and email/unknown certs
     return true;
   }
   if (srv != SECSuccess)
     LOG(ERROR) << "SetCertTrust failed with error " << PORT_GetError();
   return srv == SECSuccess;
 }
 
 }  // namespace mozilla_security_manager