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

Unified Diff: base/crypto/rsa_private_key_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
« no previous file with comments | « no previous file | base/nss_util.h » ('j') | base/nss_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/crypto/rsa_private_key_nss.cc
diff --git a/base/crypto/rsa_private_key_nss.cc b/base/crypto/rsa_private_key_nss.cc
index e952c8971b97d3e58fd4bd8e4a91f80a8c04e79c..9c474ff2241ea1024b97bda3b589162324e15b5b 100644
--- a/base/crypto/rsa_private_key_nss.cc
+++ b/base/crypto/rsa_private_key_nss.cc
@@ -107,7 +107,7 @@ RSAPrivateKey* RSAPrivateKey::FindFromPublicKeyInfo(
// Now, look for the associated private key in the user's NSS DB. If it's
// not there, consider that an error.
- PK11SlotInfo *slot = GetDefaultNSSKeySlot();
+ PK11SlotInfo *slot = GetPrivateNSSKeySlot();
if (!slot) {
NOTREACHED();
return NULL;
@@ -190,7 +190,7 @@ RSAPrivateKey* RSAPrivateKey::CreateWithParams(uint16 num_bits,
scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
- PK11SlotInfo *slot = GetDefaultNSSKeySlot();
+ PK11SlotInfo *slot = GetPrivateNSSKeySlot();
if (!slot)
return NULL;
@@ -216,7 +216,7 @@ RSAPrivateKey* RSAPrivateKey::CreateFromPrivateKeyInfoWithParams(
scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
- PK11SlotInfo *slot = GetDefaultNSSKeySlot();
+ PK11SlotInfo *slot = GetPrivateNSSKeySlot();
if (!slot)
return NULL;
« no previous file with comments | « no previous file | base/nss_util.h » ('j') | base/nss_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698