net/socket/ssl_server_socket_nss.cc - Issue 6667020: This change loads opencryptoki and uses the TPM for keygen tags.

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_server_socket_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:

Index: net/socket/ssl_server_socket_nss.cc

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

index 7d65ea9e60d2d3cd81a35c9969ef4e4b06aff78a..024290ae53d581e6e6233fe7ff38dfe85a32dbf4 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;