net/socket/ssl_client_socket_nss.cc - Issue 66213002: NSS: {EC,RSA}PrivateKey shouldn't call crypto::GetPublicNSSKeySlot or GetPrivateNSSKeySlot.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 66213002: NSS: {EC,RSA}PrivateKey shouldn't call crypto::GetPublicNSSKeySlot or GetPrivateNSSKeySlot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gyp fixes Created 7 years, 1 month 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/socket/ssl_client_socket_nss.cc

diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc

index 343bd204eabb85d42782be965e56dde4e0ff09ce..7e7f100d41e8765761e74a58294ac7da97b45301 100644

--- a/net/socket/ssl_client_socket_nss.cc

+++ b/net/socket/ssl_client_socket_nss.cc

@@ -2359,6 +2359,7 @@ int SSLClientSocketNSS::Core::ImportChannelIDKeys(SECKEYPublicKey** public_key,

// Set the private key.

if (!crypto::ECPrivateKey::ImportFromEncryptedPrivateKeyInfo(

+ crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()),

wtc 2013/11/11 20:56:25 IMPORTANT: this should be PK11_GetInternalSlot().

mattm 2013/11/12 02:42:44 Done.

ServerBoundCertService::kEPKIPassword,

reinterpret_cast<const unsigned char*>(

domain_bound_private_key_.data()),

« crypto/rsa_private_key_nss.cc ('K') | « crypto/rsa_private_key_nss.cc ('k') | remoting/remoting.gyp » ('j') | remoting/remoting.gyp » ('J')