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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sleevi comments, various build and test fixes Created 5 years, 10 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
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | net/ssl/channel_id_service.cc » ('J')
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 5c0dbe723bb0cba0c0347082b6c1344a11647f12..2955ada66489e44ee27dafca23e1458af45f36c7 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -204,30 +204,15 @@
}],
['use_openssl==1', {
'sources!': [
- 'base/crypto_module_nss.cc',
- 'base/keygen_handler_nss.cc',
'base/nss_memio.c',
'base/nss_memio.h',
- 'cert/cert_database_nss.cc',
- 'cert/cert_verify_proc_nss.cc',
- 'cert/cert_verify_proc_nss.h',
'cert/ct_log_verifier_nss.cc',
'cert/ct_objects_extractor_nss.cc',
'cert/jwk_serializer_nss.cc',
- 'cert/nss_cert_database.cc',
- 'cert/nss_cert_database.h',
- 'cert/nss_cert_database_chromeos.cc',
- 'cert/nss_cert_database_chromeos.h',
'cert/nss_profile_filter_chromeos.cc',
'cert/nss_profile_filter_chromeos.h',
'cert/scoped_nss_types.h',
- 'cert/sha256_legacy_support_nss_win.cc',
- 'cert/test_root_certs_nss.cc',
- 'cert/x509_certificate_nss.cc',
'cert/x509_util_nss.cc',
- 'cert/x509_util_nss.h',
- 'ocsp/nss_ocsp.cc',
- 'ocsp/nss_ocsp.h',
'quic/crypto/aead_base_decrypter_nss.cc',
'quic/crypto/aead_base_encrypter_nss.cc',
'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
@@ -242,12 +227,6 @@
'socket/ssl_client_socket_nss.h',
'socket/ssl_server_socket_nss.cc',
'socket/ssl_server_socket_nss.h',
- 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
- 'third_party/mozilla_security_manager/nsKeygenHandler.h',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],
'dependencies': [
'../third_party/boringssl/boringssl.gyp:boringssl',
@@ -255,7 +234,6 @@
},
{ # else !use_openssl: remove the unneeded files and depend on NSS.
'sources!': [
- 'base/crypto_module_openssl.cc',
'cert/ct_log_verifier_openssl.cc',
'cert/ct_objects_extractor_openssl.cc',
'cert/jwk_serializer_openssl.cc',
@@ -280,10 +258,14 @@
'socket/ssl_session_cache_openssl.h',
'ssl/openssl_platform_key.h',
'ssl/openssl_platform_key_mac.cc',
+ 'ssl/openssl_platform_key_nss.cc',
'ssl/openssl_platform_key_win.cc',
'ssl/openssl_ssl_util.cc',
'ssl/openssl_ssl_util.h',
],
+ },
+ ],
+ [ 'use_nss == 1 or OS == "ios" or use_openssl == 0', {
'conditions': [
# Pull in the bundled or system NSS as appropriate.
[ 'desktop_linux == 1 or chromeos == 1', {
@@ -298,10 +280,14 @@
],
}]
],
- },
- ],
+ }, {
+ 'sources!': [
+ 'cert/x509_util_nss.h',
+ ],
+ }],
[ 'use_openssl_certs == 0', {
'sources!': [
+ 'base/crypto_module_openssl.cc',
'base/keygen_handler_openssl.cc',
'base/openssl_private_key_store.h',
'base/openssl_private_key_store_android.cc',
@@ -343,17 +329,26 @@
}],
],
},
- { # else: OS is not in the above list
+ ],
+ [ 'use_nss != 1', {
'sources!': [
'base/crypto_module_nss.cc',
'base/keygen_handler_nss.cc',
'cert/cert_database_nss.cc',
+ 'cert/cert_verify_proc_nss.cc',
+ 'cert/cert_verify_proc_nss.h',
'cert/nss_cert_database.cc',
'cert/nss_cert_database.h',
+ 'ssl/openssl_platform_key_nss.cc',
'cert/test_root_certs_nss.cc',
'cert/x509_certificate_nss.cc',
+ 'cert/x509_util_nss_certs.cc',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
+ 'ssl/client_cert_store_chromeos.cc',
+ 'ssl/client_cert_store_chromeos.h',
+ 'ssl/client_cert_store_nss.cc',
+ 'ssl/client_cert_store_nss.h',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
@@ -361,16 +356,13 @@
'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],
- },
- ],
- [ 'use_nss != 1', {
- 'sources!': [
- 'cert/cert_verify_proc_nss.cc',
- 'cert/cert_verify_proc_nss.h',
- 'ssl/client_cert_store_chromeos.cc',
- 'ssl/client_cert_store_chromeos.h',
- 'ssl/client_cert_store_nss.cc',
- 'ssl/client_cert_store_nss.h',
+ }],
+ # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's
+ # libssl, but our bundled copy is not built in OpenSSL ports. Pull that
+ # file in directly.
+ [ 'use_nss == 1 and use_openssl == 1', {
+ 'sources': [
+ 'third_party/nss/ssl/cmpcert.c',
],
}],
[ 'enable_websockets != 1', {
@@ -509,8 +501,7 @@
['include', '^cert/cert_verify_proc_nss\\.cc$'],
['include', '^cert/cert_verify_proc_nss\\.h$'],
['include', '^cert/test_root_certs_nss\\.cc$'],
- ['include', '^cert/x509_util_nss\\.cc$'],
- ['include', '^cert/x509_util_nss\\.h$'],
+ ['include', '^cert/x509_util_nss_certs\\.cc$'],
['include', '^proxy/proxy_resolver_mac\\.cc$'],
['include', '^proxy/proxy_server_mac\\.cc$'],
['include', '^ocsp/nss_ocsp\\.cc$'],
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | net/ssl/channel_id_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698