Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
| 9 import("//url/config.gni") | 9 import("//url/config.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 "quic/crypto/chacha20_poly1305_decrypter_openssl.cc", | 237 "quic/crypto/chacha20_poly1305_decrypter_openssl.cc", |
| 238 "quic/crypto/chacha20_poly1305_encrypter_openssl.cc", | 238 "quic/crypto/chacha20_poly1305_encrypter_openssl.cc", |
| 239 "quic/crypto/channel_id_openssl.cc", | 239 "quic/crypto/channel_id_openssl.cc", |
| 240 "quic/crypto/p256_key_exchange_openssl.cc", | 240 "quic/crypto/p256_key_exchange_openssl.cc", |
| 241 "quic/crypto/scoped_evp_aead_ctx.cc", | 241 "quic/crypto/scoped_evp_aead_ctx.cc", |
| 242 "quic/crypto/scoped_evp_aead_ctx.h", | 242 "quic/crypto/scoped_evp_aead_ctx.h", |
| 243 "socket/ssl_client_socket_openssl.cc", | 243 "socket/ssl_client_socket_openssl.cc", |
| 244 "socket/ssl_client_socket_openssl.h", | 244 "socket/ssl_client_socket_openssl.h", |
| 245 "socket/ssl_server_socket_openssl.cc", | 245 "socket/ssl_server_socket_openssl.cc", |
| 246 "socket/ssl_server_socket_openssl.h", | 246 "socket/ssl_server_socket_openssl.h", |
| 247 "ssl/openssl_platform_key.h", | |
| 248 "ssl/openssl_platform_key_nss.cc", | |
| 249 "ssl/openssl_ssl_util.cc", | 247 "ssl/openssl_ssl_util.cc", |
| 250 "ssl/openssl_ssl_util.h", | 248 "ssl/openssl_ssl_util.h", |
| 251 "ssl/ssl_client_session_cache_openssl.cc", | 249 "ssl/ssl_client_session_cache_openssl.cc", |
| 252 "ssl/ssl_client_session_cache_openssl.h", | 250 "ssl/ssl_client_session_cache_openssl.h", |
|
Ryan Sleevi
2015/06/12 23:37:19
no files to add?
davidben
2015/06/15 21:28:24
The new interfaces aren't OpenSSL-specific (hence
Ryan Sleevi
2015/06/15 22:35:27
I'm least keen on this solution, and I don't think
davidben
2015/06/18 21:58:36
Done.
| |
| 253 ] | 251 ] |
| 254 if (is_mac) { | |
| 255 sources -= [ "ssl/openssl_platform_key_mac.cc" ] | |
| 256 } | |
| 257 if (is_win) { | 252 if (is_win) { |
| 258 sources -= [ | 253 sources -= [ "cert/sha256_legacy_support_openssl_win.cc" ] |
| 259 "cert/sha256_legacy_support_openssl_win.cc", | |
| 260 "ssl/openssl_platform_key_win.cc", | |
| 261 ] | |
| 262 } | 254 } |
| 263 } | 255 } |
| 264 | 256 |
| 265 if (!use_openssl_certs) { | 257 if (!use_openssl_certs) { |
| 266 sources -= [ | 258 sources -= [ |
| 267 "base/crypto_module_openssl.cc", | 259 "base/crypto_module_openssl.cc", |
| 268 "base/keygen_handler_openssl.cc", | 260 "base/keygen_handler_openssl.cc", |
| 269 "base/openssl_private_key_store.h", | 261 "base/openssl_private_key_store.h", |
| 270 "base/openssl_private_key_store_memory.cc", | 262 "base/openssl_private_key_store_memory.cc", |
| 271 "cert/cert_database_openssl.cc", | 263 "cert/cert_database_openssl.cc", |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 331 # These were already removed on non-ChromeOS. | 323 # These were already removed on non-ChromeOS. |
| 332 sources -= [ | 324 sources -= [ |
| 333 "cert/nss_cert_database_chromeos.cc", | 325 "cert/nss_cert_database_chromeos.cc", |
| 334 "cert/nss_cert_database_chromeos.h", | 326 "cert/nss_cert_database_chromeos.h", |
| 335 "cert/nss_profile_filter_chromeos.cc", | 327 "cert/nss_profile_filter_chromeos.cc", |
| 336 "cert/nss_profile_filter_chromeos.h", | 328 "cert/nss_profile_filter_chromeos.h", |
| 337 "ssl/client_cert_store_chromeos.cc", | 329 "ssl/client_cert_store_chromeos.cc", |
| 338 "ssl/client_cert_store_chromeos.h", | 330 "ssl/client_cert_store_chromeos.h", |
| 339 ] | 331 ] |
| 340 } | 332 } |
| 341 if (use_openssl) { | 333 sources -= [ "ssl/ssl_platform_key_nss.cc" ] |
| 342 sources -= [ "ssl/openssl_platform_key_nss.cc" ] | |
| 343 } | |
| 344 } else if (use_openssl) { | 334 } else if (use_openssl) { |
| 345 # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's | 335 # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's |
| 346 # libssl, but our bundled copy is not built in OpenSSL ports. Pull that file | 336 # libssl, but our bundled copy is not built in OpenSSL ports. Pull that file |
| 347 # in directly. | 337 # in directly. |
| 348 sources += [ "third_party/nss/ssl/cmpcert.c" ] | 338 sources += [ "third_party/nss/ssl/cmpcert.c" ] |
| 349 } | 339 } |
| 350 | 340 |
| 351 if (!enable_websockets) { | 341 if (!enable_websockets) { |
| 352 sources -= [ | 342 sources -= [ |
| 353 "websockets/websocket_basic_handshake_stream.cc", | 343 "websockets/websocket_basic_handshake_stream.cc", |
| (...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1623 } else { | 1613 } else { |
| 1624 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1614 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1625 } | 1615 } |
| 1626 | 1616 |
| 1627 if (is_win && icu_use_data_file) { | 1617 if (is_win && icu_use_data_file) { |
| 1628 # This is needed to trigger the dll copy step on windows. | 1618 # This is needed to trigger the dll copy step on windows. |
| 1629 # TODO(mark): Specifying this here shouldn't be necessary. | 1619 # TODO(mark): Specifying this here shouldn't be necessary. |
| 1630 deps += [ "//third_party/icu:icudata" ] | 1620 deps += [ "//third_party/icu:icudata" ] |
| 1631 } | 1621 } |
| 1632 } | 1622 } |
| OLD | NEW |