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

Unified Diff: net/BUILD.gn

Issue 1178193002: Sign CertificateVerify messages on a background thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more mac build fix, this is blind while mac checkout syncs Created 5 years, 6 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/log/net_log_event_type_list.h » ('j') | no next file with comments »
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 8edf028427a2ec2ae52beaf4ef1d576591d3b966..7cbb0f34b44309ca65cf0faacc102ca870844a18 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -244,22 +244,26 @@ component("net") {
"socket/ssl_client_socket_openssl.h",
"socket/ssl_server_socket_openssl.cc",
"socket/ssl_server_socket_openssl.h",
- "ssl/openssl_platform_key.h",
- "ssl/openssl_platform_key_nss.cc",
"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_platform_key.h",
+ "ssl/threaded_ssl_private_key.cc",
+ "ssl/threaded_ssl_private_key.h",
]
if (is_mac) {
- sources -= [ "ssl/openssl_platform_key_mac.cc" ]
+ sources -= [ "ssl/ssl_platform_key_mac.cc" ]
}
if (is_win) {
sources -= [
"cert/sha256_legacy_support_openssl_win.cc",
- "ssl/openssl_platform_key_win.cc",
+ "ssl/ssl_platform_key_win.cc",
]
}
+ if (use_nss_certs) {
+ sources -= [ "ssl/ssl_platform_key_nss.cc" ]
+ }
}
if (!use_openssl_certs) {
@@ -279,13 +283,22 @@ component("net") {
if (is_android) {
sources -= [ "base/openssl_private_key_store_android.cc" ]
}
- } else if (is_android) {
- # Android doesn't use these even when using OpenSSL.
+ } else {
+ if (is_android) {
+ # Android doesn't use these even when using OpenSSL.
+ sources -= [
+ "base/openssl_private_key_store_memory.cc",
+ "cert/cert_database_openssl.cc",
+ "cert/cert_verify_proc_openssl.cc",
+ "cert/test_root_certs_openssl.cc",
+ ]
+ }
+
+ # TODO(davidben): Remove these exclusions when use_openssl_certs builds also
+ # use the SSLPrivateKey machinery.
sources -= [
- "base/openssl_private_key_store_memory.cc",
- "cert/cert_database_openssl.cc",
- "cert/cert_verify_proc_openssl.cc",
- "cert/test_root_certs_openssl.cc",
+ "ssl/threaded_ssl_private_key.cc",
+ "ssl/threaded_ssl_private_key.h",
]
}
@@ -338,9 +351,7 @@ component("net") {
"ssl/client_cert_store_chromeos.h",
]
}
- if (use_openssl) {
- sources -= [ "ssl/openssl_platform_key_nss.cc" ]
- }
+ sources -= [ "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/log/net_log_event_type_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698