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

Unified Diff: net/net_common.gypi

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 | « net/net.gypi ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net_common.gypi
diff --git a/net/net_common.gypi b/net/net_common.gypi
index a4a1dc4699af5e930cfb1591e9a2954269c5b9f7..7a888a8a40ec6e7e43d0f58fd862f328e9f3e88f 100644
--- a/net/net_common.gypi
+++ b/net/net_common.gypi
@@ -174,14 +174,14 @@
'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_mac.cc',
- 'ssl/openssl_platform_key_nss.cc',
- 'ssl/openssl_platform_key_win.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/ssl_platform_key_nss.cc',
+ 'ssl/threaded_ssl_private_key.cc',
+ 'ssl/threaded_ssl_private_key.h',
],
},
],
@@ -221,6 +221,13 @@
'ssl/openssl_client_key_store.cc',
'ssl/openssl_client_key_store.h',
],
+ }, {
+ 'sources!': [
+ # TODO(davidben): Remove these exclusions when use_openssl_certs
+ # builds also use the SSLPrivateKey machinery.
+ 'ssl/threaded_ssl_private_key.cc',
+ 'ssl/threaded_ssl_private_key.h',
+ ],
}],
[ 'use_glib == 1', {
'dependencies': [
@@ -273,7 +280,7 @@
'ssl/client_cert_store_chromeos.h',
'ssl/client_cert_store_nss.cc',
'ssl/client_cert_store_nss.h',
- 'ssl/openssl_platform_key_nss.cc',
+ 'ssl/ssl_platform_key_nss.cc',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
« no previous file with comments | « net/net.gypi ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698