Removing NSS files and USE_OPENSSL flag

net/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 132 matching lines @@
   }
 
   if (!enable_built_in_dns) {
     net_shared_sources -= [
       "dns/address_sorter_posix.cc",
       "dns/address_sorter_posix.h",
       "dns/dns_client.cc",
     ]
   }
 
-  if (use_openssl) {
-    net_shared_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_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",
-    ]
-    if (is_ios) {
-      net_shared_sources -= [
-        "cert/x509_util_ios.cc",
-        "cert/x509_util_ios.h",
-      ]
-    }
-  } else {
-    net_shared_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/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_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",
-    ]
-  }
-
   if (!use_openssl_certs) {
     net_shared_sources -= [
       "base/crypto_module_openssl.cc",
       "base/keygen_handler_openssl.cc",
       "base/openssl_private_key_store.h",
       "base/openssl_private_key_store_memory.cc",
       "cert/cert_database_openssl.cc",
       "cert/cert_verify_proc_openssl.cc",
       "cert/cert_verify_proc_openssl.h",
       "cert/test_root_certs_openssl.cc",
@@ skipping 56 matching lines @@
         "cert/nss_cert_database_chromeos.h",
         "cert/nss_profile_filter_chromeos.cc",
         "cert/nss_profile_filter_chromeos.h",
       ]
     }
     net_shared_sources -= [
       "ssl/client_key_store.cc",
       "ssl/client_key_store.h",
       "ssl/ssl_platform_key_nss.cc",
     ]
-  } else if (use_openssl) {
+  } else {
     # 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.
     net_shared_sources += [ "third_party/nss/ssl/cmpcert.c" ]
   }
 
-  if (!use_nss_verifier) {
+  if (!use_nss_certs) {
     # These files are part of the partial implementation of NSS for
     # cert verification, so keep them in that case.
     net_shared_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",
     ]
   }
 
-  if (is_ios && use_nss_verifier) {
-    net_shared_sources -= [
-      "cert/cert_verify_proc_ios.cc",
-      "cert/cert_verify_proc_ios.h",
-      "cert/x509_certificate_openssl_ios.cc",
-    ]
-
-    net_shared_deps += [
-      "//third_party/nss:nspr",
-      "//third_party/nss",
-      "//net/third_party/nss/ssl:libssl",
-    ]
-  }
-
   if (is_chromecast && use_nss_certs) {
     net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ]
     net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ]
   }
 
   if (!enable_mdns) {
     net_shared_sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
       "dns/mdns_client.cc",
@@ skipping 24 matching lines @@
     # Add back some sources that were otherwise filtered out. iOS needs some Mac
     # files.
     net_shared_unfiltered_sources += [
       "base/mac/url_conversions.h",
       "base/mac/url_conversions.mm",
       "base/network_change_notifier_mac.cc",
       "base/network_config_watcher_mac.cc",
       "base/network_interfaces_mac.cc",
       "base/network_interfaces_mac.h",
       "base/platform_mime_util_mac.mm",
+      "cert/test_root_certs_mac.cc",
       "proxy/proxy_resolver_mac.cc",
       "proxy/proxy_server_mac.cc",
     ]
 
     net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ]
   }
 
-  if (is_ios && !use_nss_verifier) {
-    net_shared_unfiltered_sources += [ "cert/test_root_certs_mac.cc" ]
-    net_shared_sources -= [ "cert/x509_certificate_ios.cc" ]
-  }
-
   if (is_ios || is_mac) {
     net_shared_sources += gypi_values.net_base_mac_ios_sources
   }
 
   if (is_android) {
     net_shared_deps += [ ":net_jni_headers" ]
 
     # Add some Linux sources that were excluded by the filter, but which
     # are needed.
     net_shared_unfiltered_sources += [
@@ skipping 331 matching lines @@
     "//net/tools/tld_cleanup",
     "//testing/gmock",
     "//testing/gtest",
     "//url",
   ]
 
   if (!is_ios) {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
-  if (use_nss_verifier) {
+  if (use_nss_certs) {
     public_deps += [ "//crypto:platform" ]
   }
 
   if (is_android) {
     sources += [
       "test/spawned_test_server/remote_test_server.cc",
       "test/spawned_test_server/remote_test_server.h",
       "test/spawned_test_server/spawner_communicator.cc",
       "test/spawned_test_server/spawner_communicator.h",
     ]
@@ skipping 719 matching lines @@
     "//sql",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/zlib",
     "//url",
   ]
 
   data = [
     "data/",
   ]
-  data_deps = []
-
-  if (use_openssl) {
-    data_deps += [ "third_party/nist-pkits/" ]
-  }
+  data_deps = [
+    "third_party/nist-pkits/",
+  ]
 
   if (is_linux || is_mac || is_win) {
     deps += [
       "//third_party/pyftpdlib/",
       "//third_party/pywebsocket/",
       "//third_party/tlslite/",
     ]
     data_deps += [
       "//third_party/pyftpdlib/",
       "//third_party/pywebsocket/",
@@ skipping 38 matching lines @@
       "ssl/client_cert_store_nss_unittest.cc",
     ]
     if (is_chromeos) {  # Already removed for all non-ChromeOS builds.
       sources -= [
         "cert/nss_cert_database_chromeos_unittest.cc",
         "cert/nss_profile_filter_chromeos_unittest.cc",
       ]
     }
   }
 
-  if (use_openssl) {
-    sources -= [ "quic/test_tools/crypto_test_utils_nss.cc" ]
-  } else {
-    sources -= [
-      "quic/test_tools/crypto_test_utils_openssl.cc",
-      "ssl/ssl_client_session_cache_openssl_unittest.cc",
-    ]
-  }
-
   if (use_kerberos) {
     defines += [ "USE_KERBEROS" ]
   }
 
   # These are excluded on Android, because the actual Kerberos support, which
   # these test, is in a separate app on Android.
   if (!use_kerberos || is_android) {
     sources -= [
       "http/http_auth_gssapi_posix_unittest.cc",
       "http/mock_gssapi_library_posix.cc",
       "http/mock_gssapi_library_posix.h",
     ]
   }
   if (!use_kerberos) {
     sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
   }
 
-  if (!use_nss_verifier) {
+  if (!use_nss_certs) {
     # Only include this test when using NSS for cert verification.
     sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
   }
 
   if (!use_openssl_certs) {
     sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
   }
 
   if (enable_websockets) {
     sources += gypi_values.net_websockets_test_sources
@@ skipping 370 matching lines @@
 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") {
   sources = [
     "quic/quic_crypto_framer_parse_message_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
     "//base",
     "//net",
   ]
 }