summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 04:17:00 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 04:17:00 +0000
commit20ba9d8a3e2ffaf02ea7cc300bba52bbb040606c (patch)
tree4078a9071182e56942447c74383f22876cc5da11 /crypto/nss_util.cc
parentde37df5047683325f5189c5d54c41f704a624fbe (diff)
downloadchromium_src-20ba9d8a3e2ffaf02ea7cc300bba52bbb040606c.zip
chromium_src-20ba9d8a3e2ffaf02ea7cc300bba52bbb040606c.tar.gz
chromium_src-20ba9d8a3e2ffaf02ea7cc300bba52bbb040606c.tar.bz2
Make nss/TPM integration in ChromeOS more robust.
Change-Id: I09e942098cb780f110c115f5097f57e8344170cb BUG=chromium-os:26177 TEST=See issue. Ensure certificates still work with VPN and wifi. Review URL: http://codereview.chromium.org/9389028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
-rw-r--r--crypto/nss_util.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 4a48db1..e981cb2 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -382,10 +382,8 @@ class NSSInitSingleton {
return PK11_ReferenceSlot(test_slot_);
#if defined(OS_CHROMEOS)
- // Make sure that if EnableTPMTokenForNSS has been called that we
- // have successfully loaded Chaps.
if (tpm_token_info_delegate_.get() != NULL) {
- if (EnsureTPMTokenReady()) {
+ if (IsTPMTokenReady()) {
return PK11_ReferenceSlot(tpm_slot_);
} else {
// If we were supposed to get the hardware token, but were