Refactor client cert private key handling.

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 305 matching lines @@
     "socket/socket_performance_watcher_factory.h",
     "socket/ssl_client_socket.cc",
     "socket/ssl_client_socket.h",
     "socket/ssl_client_socket_impl.cc",
     "socket/ssl_client_socket_impl.h",
     "socket/ssl_socket.h",
     "ssl/channel_id_service.cc",
     "ssl/channel_id_service.h",
     "ssl/channel_id_store.cc",
     "ssl/channel_id_store.h",
+    "ssl/client_cert_identity.cc",
+    "ssl/client_cert_identity.h",
+    "ssl/client_cert_identity_mac.cc",
+    "ssl/client_cert_identity_mac.h",
     "ssl/client_key_store.cc",
     "ssl/client_key_store.h",
     "ssl/default_channel_id_store.cc",
     "ssl/default_channel_id_store.h",
-    "ssl/openssl_client_key_store.cc",
-    "ssl/openssl_client_key_store.h",
     "ssl/openssl_ssl_util.cc",
     "ssl/openssl_ssl_util.h",
     "ssl/ssl_cert_request_info.cc",
     "ssl/ssl_cert_request_info.h",
     "ssl/ssl_cipher_suite_names.cc",
     "ssl/ssl_cipher_suite_names.h",
     "ssl/ssl_client_auth_cache.cc",
     "ssl/ssl_client_auth_cache.h",
     "ssl/ssl_client_cert_type.h",
     "ssl/ssl_client_session_cache.cc",
@@ skipping 1292 matching lines @@
       "ssl/client_cert_store_mac.cc",
       "ssl/client_cert_store_mac.h",
       "ssl/client_cert_store_nss.cc",
       "ssl/client_cert_store_nss.h",
       "ssl/client_cert_store_win.cc",
       "ssl/client_cert_store_win.h",
       "ssl/ssl_config_service_defaults.cc",
       "ssl/ssl_config_service_defaults.h",
       "ssl/ssl_key_logger.cc",
       "ssl/ssl_key_logger.h",
-      "ssl/ssl_platform_key.h",
       "ssl/ssl_platform_key_android.cc",
       "ssl/ssl_platform_key_android.h",
       "ssl/ssl_platform_key_mac.cc",
       "ssl/ssl_platform_key_mac.h",
       "ssl/ssl_platform_key_nss.cc",
+      "ssl/ssl_platform_key_nss.h",
       "ssl/ssl_platform_key_util.cc",
       "ssl/ssl_platform_key_util.h",
       "ssl/ssl_platform_key_win.cc",
       "ssl/test_ssl_private_key.cc",
       "ssl/test_ssl_private_key.h",
       "ssl/threaded_ssl_private_key.cc",
       "ssl/threaded_ssl_private_key.h",
       "third_party/mozilla_security_manager/nsNSSCertificateDB.cpp",
       "third_party/mozilla_security_manager/nsNSSCertificateDB.h",
       "third_party/mozilla_security_manager/nsPKCS12Blob.cpp",
@@ skipping 123 matching lines @@
         sources -= [ "cert/x509_certificate_win.cc" ]
       }
     } else {
       sources -= [ "cert/x509_certificate_bytes.cc" ]
     }
 
     if (!use_openssl_certs) {
       sources -= [
         "cert/cert_database_openssl.cc",
         "cert/x509_certificate_openssl.cc",
-        "ssl/openssl_client_key_store.cc",
-        "ssl/openssl_client_key_store.h",
       ]
     } else {
       if (is_android) {
         # Android doesn't use this file even when using OpenSSL.
         sources -= [ "cert/cert_database_openssl.cc" ]
       }
     }
 
     if (!use_kerberos || is_android) {
       sources -= [
@@ skipping 51 matching lines @@
         "cert/cert_verify_proc_nss.cc",
         "cert/cert_verify_proc_nss.h",
         "cert/test_root_certs_nss.cc",
         "cert/x509_util_nss.cc",
         "cert_net/nss_ocsp.cc",
         "cert_net/nss_ocsp.h",
       ]
     }
 
     if (is_chromecast && use_nss_certs) {
-      sources += [ "ssl/ssl_platform_key_chromecast.cc" ]
-      sources -= [ "ssl/ssl_platform_key_nss.cc" ]
+      sources -= [
+        "ssl/client_cert_store_nss.cc",
+        "ssl/client_cert_store_nss.h",
+        "ssl/ssl_platform_key_nss.cc",
+      ]
     }
 
     if (!enable_mdns) {
       sources -= [
         "dns/mdns_cache.cc",
         "dns/mdns_cache.h",
         "dns/mdns_client.cc",
         "dns/mdns_client.h",
         "dns/mdns_client_impl.cc",
         "dns/mdns_client_impl.h",
@@ skipping 596 matching lines @@
     "proxy/mock_proxy_resolver.cc",
     "proxy/mock_proxy_resolver.h",
     "proxy/mock_proxy_script_fetcher.cc",
     "proxy/mock_proxy_script_fetcher.h",
     "proxy/proxy_config_service_common_unittest.cc",
     "proxy/proxy_config_service_common_unittest.h",
     "socket/socket_test_util.cc",
     "socket/socket_test_util.h",
     "spdy/chromium/spdy_test_util_common.cc",
     "spdy/chromium/spdy_test_util_common.h",
+    "ssl/client_cert_identity_test_util.cc",
+    "ssl/client_cert_identity_test_util.h",
+    "ssl/ssl_private_key_test_util.cc",
+    "ssl/ssl_private_key_test_util.h",
     "test/cert_test_util.cc",
     "test/cert_test_util.h",
     "test/cert_test_util_nss.cc",
     "test/channel_id_test_util.cc",
     "test/channel_id_test_util.h",
     "test/ct_test_util.cc",
     "test/ct_test_util.h",
     "test/embedded_test_server/default_handlers.cc",
     "test/embedded_test_server/default_handlers.h",
     "test/embedded_test_server/embedded_test_server.cc",
@@ skipping 2529 matching lines @@
     "spdy/core/spdy_no_op_visitor.h",
     "spdy/core/spdy_pinnable_buffer_piece_test.cc",
     "spdy/core/spdy_prefixed_buffer_reader_test.cc",
     "spdy/core/spdy_protocol_test.cc",
     "spdy/core/spdy_protocol_test_utils.cc",
     "spdy/core/spdy_protocol_test_utils.h",
     "spdy/core/spdy_test_utils.cc",
     "spdy/core/spdy_test_utils.h",
     "spdy/platform/api/spdy_string_utils_test.cc",
     "ssl/channel_id_service_unittest.cc",
+    "ssl/client_cert_identity_unittest.cc",
     "ssl/client_cert_store_mac_unittest.cc",
     "ssl/client_cert_store_nss_unittest.cc",
     "ssl/client_cert_store_unittest-inl.h",
     "ssl/client_cert_store_win_unittest.cc",
     "ssl/default_channel_id_store_unittest.cc",
-    "ssl/openssl_client_key_store_unittest.cc",
     "ssl/ssl_cipher_suite_names_unittest.cc",
     "ssl/ssl_client_auth_cache_unittest.cc",
     "ssl/ssl_client_session_cache_unittest.cc",
     "ssl/ssl_config_service_unittest.cc",
     "ssl/ssl_config_unittest.cc",
     "ssl/ssl_connection_status_flags_unittest.cc",
     "ssl/ssl_platform_key_android_unittest.cc",
     "ssl/ssl_platform_key_mac_unittest.cc",
     "ssl/ssl_platform_key_nss_unittest.cc",
     "ssl/ssl_platform_key_util_unittest.cc",
     "ssl/ssl_platform_key_win_unittest.cc",
-    "ssl/ssl_private_key_test_util.cc",
-    "ssl/ssl_private_key_test_util.h",
     "test/embedded_test_server/embedded_test_server_unittest.cc",
     "test/embedded_test_server/http_request_unittest.cc",
     "test/embedded_test_server/http_response_unittest.cc",
     "test/python_utils_unittest.cc",
     "test/run_all_unittests.cc",
     "third_party/nist-pkits/pkits_testcases-inl.h",
     "tools/content_decoder_tool/content_decoder_tool.cc",
     "tools/content_decoder_tool/content_decoder_tool.h",
     "tools/content_decoder_tool/content_decoder_tool_unittest.cc",
     "tools/quic/quic_simple_client_test.cc",
@@ skipping 168 matching lines @@
   }
   if (!use_kerberos) {
     sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
   }
 
   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 += [
       "server/http_connection_unittest.cc",
       "server/http_server_response_info_unittest.cc",
       "server/http_server_unittest.cc",
       "server/web_socket_encoder_unittest.cc",
       "websockets/websocket_basic_stream_test.cc",
       "websockets/websocket_channel_test.cc",
       "websockets/websocket_deflate_parameters_test.cc",
       "websockets/websocket_deflate_predictor_impl_test.cc",
@@ skipping 189 matching lines @@
   }
 
   if (is_win) {
     libs = [
       "iphlpapi.lib",
       "ncrypt.lib",
     ]
   }
 
   if (is_chromecast && use_nss_certs) {
-    sources += [ "ssl/ssl_platform_key_chromecast_unittest.cc" ]
-    sources -= [ "ssl/ssl_platform_key_nss_unittest.cc" ]
+    sources -= [
+      "ssl/client_cert_store_nss_unittest.cc",
+      "ssl/ssl_platform_key_nss_unittest.cc",
+    ]
   }
 
   # Include transport_security_state_generator tests.
   if (host_toolchain == current_toolchain) {
     deps += [ "//net/tools/transport_security_state_generator:transport_security_state_generator_test_sources" ]
   }
 
   # Add back some sources that were otherwise filtered out.
   set_sources_assignment_filter([])
   sources += net_unfiltered_sources
@@ skipping 587 matching lines @@
   ]
   deps = [
     ":net_fuzzer_test_support",
     ":test_support",
     "//base",
     "//net",
   ]
   dict = "data/fuzzer_dictionaries/net_spdy_session_fuzzer.dict"
   seed_corpus = "data/fuzzer_data/net_spdy_session_fuzzer/"
 }