diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 17:34:21 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 17:34:21 +0000 |
| commit | 6a89ef2c78c7b2ae2b56b3c50cafb493cedfd8d7 (patch) | |
| tree | a042bc9c8386ceb3090eee5ea12028bb31b9b33d /net/socket/ssl_server_socket_nss.cc | |
| parent | 2eea9bc97ca82d9221f58f12e1ee612da4042080 (diff) | |
| download | chromium_src-6a89ef2c78c7b2ae2b56b3c50cafb493cedfd8d7.zip chromium_src-6a89ef2c78c7b2ae2b56b3c50cafb493cedfd8d7.tar.gz chromium_src-6a89ef2c78c7b2ae2b56b3c50cafb493cedfd8d7.tar.bz2 | |
This change loads opencryptoki and uses the TPM for keygen tags.
on ChromeOS.
After this change, on ChromeOS we will use the TPM to generate keys
for keygen tags in forms. NSS will also have opencryptoki loaded so
it can talk to the TPM.
BUG=chromium-os:12416, chromium-os:12417
TEST=Generated keys on a ChromeOS device.
Review URL: http://codereview.chromium.org/6667020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_server_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_server_socket_nss.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index 7d65ea9..024290a 100644 --- a/net/socket/ssl_server_socket_nss.cc +++ b/net/socket/ssl_server_socket_nss.cc @@ -302,7 +302,7 @@ int SSLServerSocketNSS::InitializeSSLOptions() { } SECKEYPrivateKeyStr* private_key = NULL; - PK11SlotInfo *slot = base::GetDefaultNSSKeySlot(); + PK11SlotInfo *slot = base::GetPrivateNSSKeySlot(); if (!slot) { CERT_DestroyCertificate(cert); return ERR_UNEXPECTED; |