Removing NSS files and USE_OPENSSL flag

net/net_common.gypi

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This target is included in both 'net' and 'net_small'.
   'type': '<(component)',
   'variables': { 'enable_wexit_time_destructors': 1, },
   'dependencies': [
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../crypto/crypto.gyp:crypto',
     '../sdch/sdch.gyp:sdch',
+    '../third_party/boringssl/boringssl.gyp:boringssl',
     '../third_party/protobuf/protobuf.gyp:protobuf_lite',
     '../third_party/zlib/zlib.gyp:zlib',
     'net_derived_sources',
     'net_quic_proto',
     'net_resources',
   ],
   'sources': [
     '<@(net_nacl_common_sources)',
     '<@(net_non_nacl_sources)',
   ],
@@ skipping 74 matching lines @@
       'defines': [
         'ENABLE_BUILT_IN_DNS',
       ]
     }, { # else
       'sources!': [
         'dns/address_sorter_posix.cc',
         'dns/address_sorter_posix.h',
         'dns/dns_client.cc',
       ],
     }],
-    ['use_openssl==1', {
-        'sources!': [
-          'base/nss_memio.c',
-          'base/nss_memio.h',
-          'cert/ct_log_verifier_nss.cc',
-          'cert/ct_objects_extractor_nss.cc',
-          'cert/jwk_serializer_nss.cc',
-          'cert/scoped_nss_types.h',
-          'cert/x509_certificate_ios.cc',
-          'cert/x509_util_nss.cc',
-          'quic/crypto/aead_base_decrypter_nss.cc',
-          'quic/crypto/aead_base_encrypter_nss.cc',
-          'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
-          'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
-          'quic/crypto/chacha20_poly1305_rfc7539_decrypter_nss.cc',
-          'quic/crypto/chacha20_poly1305_rfc7539_encrypter_nss.cc',
-          'quic/crypto/channel_id_nss.cc',
-          'quic/crypto/p256_key_exchange_nss.cc',
-          'quic/crypto/proof_source_chromium_nss.cc',
-          'socket/nss_ssl_util.cc',
-          'socket/nss_ssl_util.h',
-          'socket/ssl_client_socket_nss.cc',
-          'socket/ssl_client_socket_nss.h',
-          'socket/ssl_server_socket_nss.cc',
-          'socket/ssl_server_socket_nss.h',
-          'ssl/token_binding_nss.cc',
-        ],
+    [ 'use_nss_certs == 1', {
         'dependencies': [
-          '../third_party/boringssl/boringssl.gyp:boringssl',
-        ],
-        'conditions': [
-          ['chromecast==1 and use_nss_certs==1', {
-            'sources': [
-              'ssl/ssl_platform_key_chromecast.cc',
-            ],
-            'sources!': [
-              'ssl/ssl_platform_key_nss.cc',
-            ],
-          }],
-        ],
-      },
-      {  # else !use_openssl: remove the unneeded files and depend on NSS.
-        'sources!': [
-          'cert/ct_log_verifier_openssl.cc',
-          'cert/ct_objects_extractor_openssl.cc',
-          'cert/jwk_serializer_openssl.cc',
-          'cert/x509_util_openssl.cc',
-          'cert/x509_util_openssl.h',
-          'quic/crypto/aead_base_decrypter_openssl.cc',
-          'quic/crypto/aead_base_encrypter_openssl.cc',
-          'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
-          'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
-          'quic/crypto/chacha20_poly1305_rfc7539_decrypter_openssl.cc',
-          'quic/crypto/chacha20_poly1305_rfc7539_encrypter_openssl.cc',
-          'quic/crypto/channel_id_openssl.cc',
-          'quic/crypto/p256_key_exchange_openssl.cc',
-          'quic/crypto/proof_source_chromium_openssl.cc',
-          'quic/crypto/scoped_evp_aead_ctx.cc',
-          'quic/crypto/scoped_evp_aead_ctx.h',
-          'socket/ssl_client_socket_openssl.cc',
-          'socket/ssl_client_socket_openssl.h',
-          'socket/ssl_server_socket_openssl.cc',
-          'socket/ssl_server_socket_openssl.h',
-          'ssl/client_key_store.cc',
-          'ssl/client_key_store.h',
-          'ssl/openssl_ssl_util.cc',
-          'ssl/openssl_ssl_util.h',
-          'ssl/ssl_client_session_cache_openssl.cc',
-          'ssl/ssl_client_session_cache_openssl.h',
-          'ssl/ssl_key_logger.cc',
-          'ssl/ssl_key_logger.h',
-          'ssl/ssl_platform_key.h',
-          'ssl/ssl_platform_key_nss.cc',
-          'ssl/ssl_platform_key_task_runner.cc',
-          'ssl/ssl_platform_key_task_runner.h',
-          'ssl/test_ssl_private_key.cc',
-          'ssl/test_ssl_private_key.h',
-          'ssl/threaded_ssl_private_key.cc',
-          'ssl/threaded_ssl_private_key.h',
-          'ssl/token_binding_openssl.cc',
-        ],
-      },
-    ],
-    [ 'use_nss_verifier == 1', {
-        'conditions': [
-          # Pull in the bundled or system NSS as appropriate.
-          [ 'desktop_linux == 1 or chromeos == 1', {
-            'dependencies': [
-              '../build/linux/system.gyp:ssl',
-            ],
-          }, {
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
-            ],
-          }]
+          '../build/linux/system.gyp:ssl',
         ],
       }, {
         'sources!': [
           'cert/x509_util_nss.h',
         ],
       },
     ],
+    ['chromecast==1 and use_nss_certs==1', {
+      'sources': [
+        'ssl/ssl_platform_key_chromecast.cc',
+      ],
+      'sources!': [
+        'ssl/ssl_platform_key_nss.cc',
+      ],
+    }],
     [ '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',
           'base/openssl_private_key_store_memory.cc',
           'cert/cert_database_openssl.cc',
           'cert/cert_verify_proc_openssl.cc',
           'cert/cert_verify_proc_openssl.h',
@@ skipping 30 matching lines @@
             },
           }],
         ],
       },
     ],
     [ '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_nss.cc',
           'ssl/client_cert_store_nss.h',
           'ssl/client_key_store.cc',
           'ssl/client_key_store.h',
           'ssl/ssl_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',
           'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
           'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
           'third_party/mozilla_security_manager/nsPKCS12Blob.h',
         ],
       },
     ],
-    [ 'use_nss_verifier != 1', {
-        'sources!': [
-          'cert/cert_verify_proc_nss.cc',
-          'cert/cert_verify_proc_nss.h',
-          'cert/test_root_certs_nss.cc',
-          'cert/x509_util_nss_certs.cc',
-          'cert_net/nss_ocsp.cc',
-          'cert_net/nss_ocsp.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', {
+    [ 'use_nss_certs == 1', {
         'sources': [
           'third_party/nss/ssl/cmpcert.c',
         ],
     }],
-    [ 'OS == "ios" and use_nss_verifier == 0', {
-        'sources!': [
-          'cert/x509_util_ios.cc',
-          'cert/x509_util_ios.h',
-        ],
-    }],
-    [ 'OS == "ios" and use_nss_verifier == 1', {
-        'sources!': [
-          'cert/cert_verify_proc_ios.cc',
-          'cert/cert_verify_proc_ios.h',
-          'cert/x509_certificate_openssl_ios.cc',
-        ],
-    }],
     [ 'enable_websockets == 1', {
         'sources': ['<@(net_websockets_sources)']
     }],
     [ 'enable_mdns != 1', {
         'sources!' : [
           'dns/mdns_cache.cc',
           'dns/mdns_cache.h',
           'dns/mdns_client.cc',
           'dns/mdns_client.h',
           'dns/mdns_client_impl.cc',
@@ skipping 125 matching lines @@
         ['include', '^base/mac/url_conversions\\.mm$'],
         ['include', '^base/network_change_notifier_mac\\.cc$'],
         ['include', '^base/network_config_watcher_mac\\.cc$'],
         ['include', '^base/network_interfaces_mac\\.cc$'],
         ['include', '^base/network_interfaces_mac\\.h$'],
         ['include', '^base/platform_mime_util_mac\\.mm$'],
         ['include', '^proxy/proxy_resolver_mac\\.cc$'],
         ['include', '^proxy/proxy_server_mac\\.cc$'],
       ],
     }],
-    ['OS == "ios" and <(use_nss_verifier) == 0', {
+    ['OS == "ios"', {
       'sources/': [
         ['include', '^cert/test_root_certs_mac\\.cc$'],
       ],
     }],
   ],
 }