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

Unified Diff: net/net.gyp

Issue 8296014: Use NSS to generate Origin-Bound Certs on Win and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address other points of original review too Created 9 years, 2 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
« net/base/x509_util_openssl.cc ('K') | « net/base/x509_util_openssl_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 6bc9340d39caf8bec0bcba3e6ae7b3f3644d9d51..b36d3981c9b73e113b2d9059ef98a899196eddbb 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -247,6 +247,9 @@
'base/x509_certificate_nss.cc',
'base/x509_certificate_openssl.cc',
'base/x509_certificate_win.cc',
+ 'base/x509_util.h',
+ 'base/x509_util_nss.cc',
+ 'base/x509_util_nss.h',
'base/x509_util_openssl.cc',
'base/x509_util_openssl.h',
'disk_cache/addr.cc',
@@ -763,6 +766,8 @@
'base/nss_memio.h',
'base/test_root_certs_nss.cc',
'base/x509_certificate_nss.cc',
+ 'base/x509_util_nss.cc',
+ 'base/x509_util_nss.h',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
'socket/dns_cert_provenance_check.cc',
@@ -974,6 +979,8 @@
'base/upload_data_stream_unittest.cc',
'base/x509_certificate_unittest.cc',
'base/x509_cert_types_mac_unittest.cc',
+ 'base/x509_util_nss_unittest.cc',
+ 'base/x509_util_openssl_unittest.cc',
'disk_cache/addr_unittest.cc',
'disk_cache/backend_unittest.cc',
'disk_cache/bitmap_unittest.cc',
@@ -1155,10 +1162,16 @@
# TODO(bulach): Add equivalent tests when the underlying
# functionality is ported to OpenSSL.
'sources!': [
+ 'base/x509_util_nss_unittest.cc',
'base/cert_database_nss_unittest.cc',
'base/dnssec_unittest.cc',
],
},
+ { # else !use_openssl: remove the unneeded files
wtc 2011/10/17 19:09:27 Put this on the previous line. See line 1152 abov
mattm 2011/10/17 22:54:19 Done.
+ 'sources!': [
+ 'base/x509_util_openssl_unittest.cc',
+ ],
+ },
],
[ 'OS == "win"', {
'sources!': [
@@ -1169,6 +1182,17 @@
# TODO(mark): Specifying this here shouldn't be necessary.
'dependencies': [
'../third_party/icu/icu.gyp:icudata',
+ '../third_party/nss/nss.gyp:nspr',
+ '../third_party/nss/nss.gyp:nss',
+ 'third_party/nss/ssl.gyp:ssl',
+ ],
+ },
+ ],
+ [ 'OS == "mac"', {
+ 'dependencies': [
+ '../third_party/nss/nss.gyp:nspr',
+ '../third_party/nss/nss.gyp:nss',
+ 'third_party/nss/ssl.gyp:ssl',
],
},
],
« net/base/x509_util_openssl.cc ('K') | « net/base/x509_util_openssl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698