Merge 257570 "Handle cases when user cert database has NULL slots"

chromeos/cert_loader.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "crypto/nss_util.h"
+#include "crypto/scoped_nss_types.h"
 #include "net/cert/nss_cert_database.h"
 #include "net/cert/nss_cert_database_chromeos.h"
 #include "net/cert/x509_certificate.h"
 
 namespace chromeos {
 
 static CertLoader* g_cert_loader = NULL;
 
 // static
 void CertLoader::Initialize() {
@@ skipping 53 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void CertLoader::RemoveObserver(CertLoader::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 int CertLoader::TPMTokenSlotID() const {
   if (!database_)
     return -1;
-  return static_cast<int>(PK11_GetSlotID(database_->GetPrivateSlot().get()));
+  crypto::ScopedPK11Slot slot(database_->GetPrivateSlot());
+  if (!slot)
+    return -1;
+  return static_cast<int>(PK11_GetSlotID(slot.get()));
 }
 
 bool CertLoader::IsHardwareBacked() const {
-  return force_hardware_backed_for_test_ ||
-      (database_ && PK11_IsHW(database_->GetPrivateSlot().get()));
+  if (force_hardware_backed_for_test_)
+    return true;
+  if (!database_)
+    return false;
+  crypto::ScopedPK11Slot slot(database_->GetPrivateSlot());
+  if (!slot)
+    return false;
+  return PK11_IsHW(slot.get());
 }
 
 bool CertLoader::IsCertificateHardwareBacked(
     const net::X509Certificate* cert) const {
   if (!database_)
     return false;
   return database_->IsHardwareBacked(cert);
 }
 
 bool CertLoader::CertificatesLoading() const {
@@ skipping 79 matching lines @@
   VLOG(1) << "OnCertAdded";
   LoadCertificates();
 }
 
 void CertLoader::OnCertRemoved(const net::X509Certificate* cert) {
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 }  // namespace chromeos