Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: net/base/keygen_handler_nss.cc

Issue 6667020: This change loads opencryptoki and uses the TPM for keygen tags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleaning up Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/keygen_handler_nss.cc
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index 74fb9a64e411b87b8379d4239f23ccf2b218f6c2..1734c3bd3bda43af06b0ae22ae36ef1f4631799b 100644
--- a/net/base/keygen_handler_nss.cc
+++ b/net/base/keygen_handler_nss.cc
@@ -20,17 +20,17 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
// Ensure NSS is initialized.
base::EnsureNSSInit();
- // TODO(mattm): allow choosing which slot to generate and store the key?
- base::ScopedPK11Slot slot(base::GetDefaultNSSKeySlot());
+ // TODO(mattm): allow choosing which slot to generate and store the key.
+ base::ScopedPK11Slot slot(base::GetPrivateNSSKeySlot());
if (!slot.get()) {
- LOG(ERROR) << "Couldn't get internal key slot!";
+ LOG(ERROR) << "Couldn't get private key slot from NSS!";
return std::string();
}
// Authenticate to the token.
if (SECSuccess != PK11_Authenticate(slot.get(), PR_TRUE,
crypto_module_password_delegate_.get())) {
- LOG(ERROR) << "Couldn't authenticate to internal key slot!";
+ LOG(ERROR) << "Couldn't authenticate to private key slot!";
return std::string();
}

Powered by Google App Engine
This is Rietveld 408576698