summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 01:48:43 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 01:48:43 +0000
commit88b9db7d713a9e156fa66694844c4d98ee48d875 (patch)
treea06b93ff3319bc3512051372ecadd693ebeeaf80 /net/net.gyp
parent6fd024b93e4a708a767c1892e5091e3585a5c72f (diff)
downloadchromium_src-88b9db7d713a9e156fa66694844c4d98ee48d875.zip
chromium_src-88b9db7d713a9e156fa66694844c4d98ee48d875.tar.gz
chromium_src-88b9db7d713a9e156fa66694844c4d98ee48d875.tar.bz2
NSS: PKCS 11 password prompt.
This was based off of davidben's WIP cl http://codereview.chromium.org/3186021/show. BUG=42073 TEST=add password to NSS DB with "certutil -d sql:.pki/nssdb -W", try client auth, <keygen>, cert manager Review URL: http://codereview.chromium.org/5686002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 649544a..485ac38 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',