Support building BoringSSL with NSS certificates.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 834a4c62e8ec5a33132f43f95c1ad541827b55e9..a6958c7684fa2330497cc3df2a97aec303ca247c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -204,30 +204,16 @@
         }],
         ['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/sha256_legacy_support_nss_win.cc',
               'cert/scoped_nss_types.h',
-              '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 +228,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',
@@ -280,11 +260,15 @@
               'socket/ssl_session_cache_openssl.cc',
               'socket/ssl_session_cache_openssl.h',
               'ssl/openssl_platform_key_mac.cc',
+              'ssl/openssl_platform_key_nss.cc',
               'ssl/openssl_platform_key_win.cc',
               'ssl/openssl_platform_key.h',
               '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', {
@@ -299,8 +283,11 @@
                 ],
               }]
             ],
-          },
-        ],
+        }, {
+            'sources!': [
+              'cert/x509_util_nss.h',
+            ],
+        }],
         [ 'use_openssl_certs == 0', {
             'sources!': [
               'base/keygen_handler_openssl.cc',
@@ -344,17 +331,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',
@@ -362,16 +358,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_nss.cc',
-              'ssl/client_cert_store_nss.h',
-              'ssl/client_cert_store_chromeos.cc',
-              'ssl/client_cert_store_chromeos.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', {
@@ -510,8 +503,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$'],