Add a ClientKeyStore to allow injection of non-platform keys for TLS client auth.

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/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 248 matching lines @@
     if (is_mac) {
       sources -= [ "ssl/ssl_platform_key_mac.cc" ]
     }
     if (is_win) {
       sources -= [
         "cert/sha256_legacy_support_openssl_win.cc",
         "ssl/ssl_platform_key_win.cc",
       ]
     }
     if (use_nss_certs) {
-      sources -= [ "ssl/ssl_platform_key_nss.cc" ]
+      sources -= [

[mattm, 2015/08/21 23:18:17]

I don't understand why they are removed in this case..

[pneubeck (no reviews), 2015/08/24 10:08:06]

As the ClientKeyStore is used by ssl_platform_key_nss.cc, I added/removed it in
the same cases.
Just somehow dropped the net_common.gypi changes. Fixed that now.

+        "ssl/client_key_store.cc",
+        "ssl/client_key_store.h",
+        "ssl/ssl_platform_key_nss.cc",
+      ]
     }
   }
 
   if (!use_openssl_certs) {
     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",
@@ skipping 68 matching lines @@
       # These were already removed on non-ChromeOS.
       sources -= [
         "cert/nss_cert_database_chromeos.cc",
         "cert/nss_cert_database_chromeos.h",
         "cert/nss_profile_filter_chromeos.cc",
         "cert/nss_profile_filter_chromeos.h",
         "ssl/client_cert_store_chromeos.cc",
         "ssl/client_cert_store_chromeos.h",
       ]
     }
-    sources -= [ "ssl/ssl_platform_key_nss.cc" ]
+    sources -= [

[mattm, 2015/08/21 23:18:17]

odd, why are there two sources-= statements in this block?

[pneubeck (no reviews), 2015/08/24 10:08:06]

Acknowledged.

+      "ssl/client_key_store.cc",
+      "ssl/client_key_store.h",

[mattm, 2015/08/21 23:18:17]

these should be removed in the same case(s) in net/net_common.gypi too?

[pneubeck (no reviews), 2015/08/24 10:08:06]

Done.

+      "ssl/ssl_platform_key_nss.cc",
+    ]
   } else if (use_openssl) {
     # 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.
     sources += [ "third_party/nss/ssl/cmpcert.c" ]
   }
 
   if (!enable_websockets) {
     sources -= [
       "websockets/websocket_basic_handshake_stream.cc",
@@ skipping 1317 matching lines @@
   if (enable_websockets) {
     sources += [ "websockets/websocket_frame_perftest.cc" ]
   }
 
   if (use_v8_in_net) {
     deps += [ ":net_with_v8" ]
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 }