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

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: Added TODO Created 9 years, 9 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
« base/nss_util_internal.h ('K') | « base/nss_util_internal.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..726aa96c49a9a1e412bfaf9bb692de8cecc11172 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::GetRsaKeySlot());
if (!slot.get()) {
- LOG(ERROR) << "Couldn't get internal key slot!";
+ LOG(ERROR) << "Couldn't get RSA 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 RSA key slot!";
wtc 2011/03/16 18:41:44 The "RSA key slot" strings in this file should be
Greg Spencer (Chromium) 2011/03/16 21:37:51 Done.
return std::string();
}
« base/nss_util_internal.h ('K') | « base/nss_util_internal.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698