net/socket/ssl_server_socket_nss.cc - Issue 383593002: Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

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 383593002: Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: changes for comment #5 Created 6 years, 5 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

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 cfdc5c545ef894b992722d24aedb89c49aa9f0f2..3911f67644039006289cb9accba9b2e424f28fdc 100644

--- a/net/socket/ssl_server_socket_nss.cc

+++ b/net/socket/ssl_server_socket_nss.cc

@@ -446,7 +446,7 @@ int SSLServerSocketNSS::InitializeSSLOptions() {

}

SECKEYPrivateKeyStr* private_key = NULL;

- PK11SlotInfo* slot = crypto::GetPrivateNSSKeySlot();

+ PK11SlotInfo* slot = PK11_GetInternalSlot();

if (!slot) {

CERT_DestroyCertificate(cert);

return ERR_UNEXPECTED;

« no previous file with comments | « net/cert/nss_cert_database.cc ('k') | net/ssl/client_cert_store_chromeos_unittest.cc » ('j') | no next file with comments »