Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: net/BUILD.gn

Issue 1278763002: Add a ClientKeyStore to allow injection of non-platform keys for TLS client auth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client_cert_store
Patch Set: Removed ownership of Providers. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/net.gypi » ('j') | net/ssl/client_key_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 823d8698f207d3cfc581bd878edf3bd7fc3fd6f9..585b47b52140a29f5ea5dc1a6fccce22f36badf4 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -266,7 +266,11 @@ component("net") {
]
}
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 ca
pneubeck (no reviews) 2015/08/24 10:08:06 As the ClientKeyStore is used by ssl_platform_key_
+ "ssl/client_key_store.cc",
+ "ssl/client_key_store.h",
+ "ssl/ssl_platform_key_nss.cc",
+ ]
}
}
@@ -355,7 +359,11 @@ component("net") {
"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 thi
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
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
« no previous file with comments | « no previous file | net/net.gypi » ('j') | net/ssl/client_key_store.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698