Support building BoringSSL with NSS certificates.

net/net_common.gypi

Index: net/net_common.gypi
diff --git a/net/net_common.gypi b/net/net_common.gypi
index 4bb8235abb5337f62e1dbca109304917af49fab9..77134f5d2a3f4bff826e05f140eb15ec1fd852dc 100644
--- a/net/net_common.gypi
+++ b/net/net_common.gypi
@@ -125,30 +125,14 @@
     }],
     ['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',
-          'cert_net/nss_ocsp.cc',
-          'cert_net/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',
@@ -163,12 +147,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',
@@ -176,7 +154,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',
@@ -199,12 +176,16 @@
           'socket/ssl_server_socket_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',
           'ssl/ssl_client_session_cache_openssl.cc',
           'ssl/ssl_client_session_cache_openssl.h',
         ],
+      },
+    ],
+    [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', {
         'conditions': [
           # Pull in the bundled or system NSS as appropriate.
           [ 'desktop_linux == 1 or chromeos == 1', {
@@ -219,10 +200,15 @@
             ],
           }]
         ],
+      }, {
+        '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',
@@ -264,17 +250,30 @@
           }],
         ],
       },
-      {  # else: OS is not in the above list
+    ],
+    [ 'use_nss_certs != 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',
+          '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/test_root_certs_nss.cc',
           'cert/x509_certificate_nss.cc',
+          'cert/x509_util_nss_certs.cc',
           'cert_net/nss_ocsp.cc',
           'cert_net/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',
+          'ssl/openssl_platform_key_nss.cc',
           'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
           'third_party/mozilla_security_manager/nsKeygenHandler.h',
           'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
@@ -284,14 +283,12 @@
         ],
       },
     ],
-    [ 'use_nss_certs != 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_certs == 1 and use_openssl == 1', {
+        'sources': [
+          'third_party/nss/ssl/cmpcert.c',
         ],
     }],
     [ 'enable_websockets != 1', {
@@ -416,8 +413,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', '^cert_net/nss_ocsp\\.cc$'],
         ['include', '^cert_net/nss_ocsp\\.h$'],
         ['include', '^proxy/proxy_resolver_mac\\.cc$'],