summaryrefslogtreecommitdiffstats
path: root/chromeos/cert_loader.cc
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2014-09-11 12:00:01 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 19:07:10 +0000
commitba249ef277f2fe628f82b8280f70491d0d4a535a (patch)
treebc408b1a16a1469bdd53c16fbfc7b5e41c73df02 /chromeos/cert_loader.cc
parent1b970299e390f8a5d7091ec888e1e7013731cffc (diff)
downloadchromium_src-ba249ef277f2fe628f82b8280f70491d0d4a535a.zip
chromium_src-ba249ef277f2fe628f82b8280f70491d0d4a535a.tar.gz
chromium_src-ba249ef277f2fe628f82b8280f70491d0d4a535a.tar.bz2
Make the private slot optional in NSSCertDatabase.
BUG=411927 Review URL: https://codereview.chromium.org/556243003 Cr-Commit-Position: refs/heads/master@{#294438}
Diffstat (limited to 'chromeos/cert_loader.cc')
-rw-r--r--chromeos/cert_loader.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc
index 337c70e..dc8715b 100644
--- a/chromeos/cert_loader.cc
+++ b/chromeos/cert_loader.cc
@@ -90,7 +90,8 @@ bool CertLoader::IsHardwareBacked() const {
if (!database_)
return false;
crypto::ScopedPK11Slot slot(database_->GetPrivateSlot());
- DCHECK(slot);
+ if (!slot)
+ return false;
return PK11_IsHW(slot.get());
}