summaryrefslogtreecommitdiffstats
path: root/chromeos/cert_loader.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 23:01:51 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 23:01:51 +0000
commitf4e5014e5db9e36154e8745fb6bb9954bf8b3a55 (patch)
treed24c382f19bb0cb482b6358b78d0a664d5f40c97 /chromeos/cert_loader.cc
parent036ef8b43faf1a129ea06a9e25901c63d993e898 (diff)
downloadchromium_src-f4e5014e5db9e36154e8745fb6bb9954bf8b3a55.zip
chromium_src-f4e5014e5db9e36154e8745fb6bb9954bf8b3a55.tar.gz
chromium_src-f4e5014e5db9e36154e8745fb6bb9954bf8b3a55.tar.bz2
CertLoader: Set TPM_DISABLED state when logged in as guest
BUG=241285 R=nkostylev@chromium.org Review URL: https://codereview.chromium.org/21939004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cert_loader.cc')
-rw-r--r--chromeos/cert_loader.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc
index ff57d36..d60b9d0 100644
--- a/chromeos/cert_loader.cc
+++ b/chromeos/cert_loader.cc
@@ -158,6 +158,10 @@ void CertLoader::InitializeTokenAndLoadCertificates() {
CHECK(thread_checker_.CalledOnValidThread());
VLOG(1) << "InitializeTokenAndLoadCertificates: " << tpm_token_state_;
+ // Treat TPM as disabled for guest users since they do not store certs.
+ if (LoginState::IsInitialized() && LoginState::Get()->IsGuestUser())
+ tpm_token_state_ = TPM_DISABLED;
+
switch (tpm_token_state_) {
case TPM_STATE_UNKNOWN: {
crypto_task_runner_->PostTaskAndReply(