summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 02:13:49 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 02:13:49 +0000
commit6b4903fd14ab76dfbe872f6c6d7184c428d67260 (patch)
treebc76f151a44c88e1f35ae79df1dfb9ef7e4c3bae /crypto
parent9cd45640442bb7b639d2675363b2239ff183a092 (diff)
downloadchromium_src-6b4903fd14ab76dfbe872f6c6d7184c428d67260.zip
chromium_src-6b4903fd14ab76dfbe872f6c6d7184c428d67260.tar.gz
chromium_src-6b4903fd14ab76dfbe872f6c6d7184c428d67260.tar.bz2
Convert SSLClientSocketNSS to use the NSS Channel ID callback.
BUG=129174,127506 TEST=run a TLS Channel ID supporting server, try connecting to it. TBR=joi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10560020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ec_private_key_nss.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ec_private_key_nss.cc b/crypto/ec_private_key_nss.cc
index a799285..c6c4763 100644
--- a/crypto/ec_private_key_nss.cc
+++ b/crypto/ec_private_key_nss.cc
@@ -114,7 +114,7 @@ bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo(
bool sensitive,
SECKEYPrivateKey** key,
SECKEYPublicKey** public_key) {
- ScopedPK11Slot slot(GetPrivateNSSKeySlot());
+ ScopedPK11Slot slot(GetPublicNSSKeySlot());
if (!slot.get())
return false;