net/net.gyp - Issue 5686002: NSS: PKCS 11 password prompt.

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/net.gyp

Issue 5686002: NSS: PKCS 11 password prompt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressing review comments Created 9 years, 11 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/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 649544a8711ba80ff663e381a96417ac79a7e034..485ac38b46a2bbba3e86082455039dab65ebb9d0 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -54,6 +54,8 @@

'base/cookie_policy.h',

'base/cookie_store.cc',

'base/cookie_store.h',

+ 'base/crypto_module.h',

+ 'base/crypto_module_nss.cc',

'base/data_url.cc',

'base/data_url.h',

'base/directory_lister.cc',

@@ -96,6 +98,7 @@

'base/host_resolver_proc.h',

'base/io_buffer.cc',

'base/io_buffer.h',

+ 'base/keygen_handler.cc',

'base/keygen_handler.h',

'base/keygen_handler_mac.cc',

'base/keygen_handler_nss.cc',

@@ -257,6 +260,7 @@

{ # else: OS is not in the above list

'sources!': [

'base/cert_database_nss.cc',

+ 'base/crypto_module_nss.cc',

'base/keygen_handler_nss.cc',

'base/test_root_certs_nss.cc',

'base/x509_certificate_nss.cc',

@@ -274,6 +278,7 @@

[ 'use_openssl==1', {

'sources!': [

'base/cert_database_nss.cc',

+ 'base/crypto_module_nss.cc',

'base/dnssec_keyset.cc',

'base/dnssec_keyset.h',

'base/keygen_handler_nss.cc',

« no previous file with comments | « net/base/keygen_handler_nss.cc ('k') | net/third_party/mozilla_security_manager/nsKeygenHandler.h » ('j') | no next file with comments »