Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'base/cert_verify_result.h', 47 'base/cert_verify_result.h',
48 'base/completion_callback.h', 48 'base/completion_callback.h',
49 'base/connection_type_histograms.cc', 49 'base/connection_type_histograms.cc',
50 'base/connection_type_histograms.h', 50 'base/connection_type_histograms.h',
51 'base/cookie_monster.cc', 51 'base/cookie_monster.cc',
52 'base/cookie_monster.h', 52 'base/cookie_monster.h',
53 'base/cookie_options.h', 53 'base/cookie_options.h',
54 'base/cookie_policy.h', 54 'base/cookie_policy.h',
55 'base/cookie_store.cc', 55 'base/cookie_store.cc',
56 'base/cookie_store.h', 56 'base/cookie_store.h',
57 'base/crypto_module.h',
58 'base/crypto_module_nss.cc',
57 'base/data_url.cc', 59 'base/data_url.cc',
58 'base/data_url.h', 60 'base/data_url.h',
59 'base/directory_lister.cc', 61 'base/directory_lister.cc',
60 'base/directory_lister.h', 62 'base/directory_lister.h',
61 'base/dns_reload_timer.cc', 63 'base/dns_reload_timer.cc',
62 'base/dns_reload_timer.h', 64 'base/dns_reload_timer.h',
63 'base/dnssec_chain_verifier.cc', 65 'base/dnssec_chain_verifier.cc',
64 'base/dnssec_chain_verifier.h', 66 'base/dnssec_chain_verifier.h',
65 'base/dnssec_keyset.cc', 67 'base/dnssec_keyset.cc',
66 'base/dnssec_keyset.h', 68 'base/dnssec_keyset.h',
(...skipping 22 matching lines...) Expand all
89 'base/host_port_pair.cc', 91 'base/host_port_pair.cc',
90 'base/host_port_pair.h', 92 'base/host_port_pair.h',
91 'base/host_resolver.cc', 93 'base/host_resolver.cc',
92 'base/host_resolver.h', 94 'base/host_resolver.h',
93 'base/host_resolver_impl.cc', 95 'base/host_resolver_impl.cc',
94 'base/host_resolver_impl.h', 96 'base/host_resolver_impl.h',
95 'base/host_resolver_proc.cc', 97 'base/host_resolver_proc.cc',
96 'base/host_resolver_proc.h', 98 'base/host_resolver_proc.h',
97 'base/io_buffer.cc', 99 'base/io_buffer.cc',
98 'base/io_buffer.h', 100 'base/io_buffer.h',
101 'base/keygen_handler.cc',
99 'base/keygen_handler.h', 102 'base/keygen_handler.h',
100 'base/keygen_handler_mac.cc', 103 'base/keygen_handler_mac.cc',
101 'base/keygen_handler_nss.cc', 104 'base/keygen_handler_nss.cc',
102 'base/keygen_handler_openssl.cc', 105 'base/keygen_handler_openssl.cc',
103 'base/keygen_handler_win.cc', 106 'base/keygen_handler_win.cc',
104 'base/listen_socket.cc', 107 'base/listen_socket.cc',
105 'base/listen_socket.h', 108 'base/listen_socket.h',
106 'base/load_flags.h', 109 'base/load_flags.h',
107 'base/load_flags_list.h', 110 'base/load_flags_list.h',
108 'base/load_states.h', 111 'base/load_states.h',
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 }, { # else: not using openssl. Use NSS. 253 }, { # else: not using openssl. Use NSS.
251 'dependencies': [ 254 'dependencies': [
252 '../build/linux/system.gyp:nss', 255 '../build/linux/system.gyp:nss',
253 ], 256 ],
254 }], 257 }],
255 ], 258 ],
256 }, 259 },
257 { # else: OS is not in the above list 260 { # else: OS is not in the above list
258 'sources!': [ 261 'sources!': [
259 'base/cert_database_nss.cc', 262 'base/cert_database_nss.cc',
263 'base/crypto_module_nss.cc',
260 'base/keygen_handler_nss.cc', 264 'base/keygen_handler_nss.cc',
261 'base/test_root_certs_nss.cc', 265 'base/test_root_certs_nss.cc',
262 'base/x509_certificate_nss.cc', 266 'base/x509_certificate_nss.cc',
263 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 267 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
264 'third_party/mozilla_security_manager/nsKeygenHandler.h', 268 'third_party/mozilla_security_manager/nsKeygenHandler.h',
265 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 269 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
266 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 270 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
267 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', 271 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
268 'third_party/mozilla_security_manager/nsNSSCertTrust.h', 272 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
269 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 273 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
270 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 274 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
271 ], 275 ],
272 }, 276 },
273 ], 277 ],
274 [ 'use_openssl==1', { 278 [ 'use_openssl==1', {
275 'sources!': [ 279 'sources!': [
276 'base/cert_database_nss.cc', 280 'base/cert_database_nss.cc',
281 'base/crypto_module_nss.cc',
277 'base/dnssec_keyset.cc', 282 'base/dnssec_keyset.cc',
278 'base/dnssec_keyset.h', 283 'base/dnssec_keyset.h',
279 'base/keygen_handler_nss.cc', 284 'base/keygen_handler_nss.cc',
280 'base/nss_memio.c', 285 'base/nss_memio.c',
281 'base/nss_memio.h', 286 'base/nss_memio.h',
282 'base/test_root_certs_nss.cc', 287 'base/test_root_certs_nss.cc',
283 'base/x509_certificate_nss.cc', 288 'base/x509_certificate_nss.cc',
284 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 289 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
285 'third_party/mozilla_security_manager/nsKeygenHandler.h', 290 'third_party/mozilla_security_manager/nsKeygenHandler.h',
286 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 291 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 ], 1439 ],
1435 }], 1440 }],
1436 ], 1441 ],
1437 } 1442 }
1438 1443
1439 # Local Variables: 1444 # Local Variables:
1440 # tab-width:2 1445 # tab-width:2
1441 # indent-tabs-mode:nil 1446 # indent-tabs-mode:nil
1442 # End: 1447 # End:
1443 # vim: set expandtab tabstop=2 shiftwidth=2: 1448 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698