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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« net/cert/test_certificate_data.h ('K') | « net/http/transport_security_state_unittest.cc ('k') | net/proxy/proxy_script_fetcher_impl.cc » ('j') | remoting/host/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 1191078275b3df0a6aae04f46f90e7ba28bf329f..95db5656f6019a8cffcf54b43800cee8eef1efc0 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -83,8 +83,8 @@
'base/address_list.h',
'base/address_tracker_linux.cc',
'base/address_tracker_linux.h',
- 'base/asn1_util.cc',
- 'base/asn1_util.h',
+ 'cert/asn1_util.cc',
+ 'cert/asn1_util.h',
'base/auth.cc',
'base/auth.h',
'base/backoff_entry.cc',
@@ -94,38 +94,38 @@
'base/big_endian.cc',
'base/big_endian.h',
'base/cache_type.h',
- 'base/cert_database.cc',
- 'base/cert_database.h',
- 'base/cert_database_android.cc',
- 'base/cert_database_ios.cc',
- 'base/cert_database_mac.cc',
- 'base/cert_database_nss.cc',
- 'base/cert_database_openssl.cc',
- 'base/cert_database_win.cc',
- 'base/cert_status_flags.cc',
+ 'cert/cert_database.cc',
+ 'cert/cert_database.h',
+ 'cert/cert_database_android.cc',
+ 'cert/cert_database_ios.cc',
+ 'cert/cert_database_mac.cc',
+ 'cert/cert_database_nss.cc',
+ 'cert/cert_database_openssl.cc',
+ 'cert/cert_database_win.cc',
+ 'cert/cert_status_flags.cc',
'base/cert_status_flags.h',
- 'base/cert_trust_anchor_provider.h',
- 'base/cert_verifier.cc',
- 'base/cert_verifier.h',
- 'base/cert_verify_proc.cc',
- 'base/cert_verify_proc.h',
- 'base/cert_verify_proc_android.cc',
- 'base/cert_verify_proc_android.h',
- 'base/cert_verify_proc_mac.cc',
- 'base/cert_verify_proc_mac.h',
- 'base/cert_verify_proc_nss.cc',
- 'base/cert_verify_proc_nss.h',
- 'base/cert_verify_proc_openssl.cc',
- 'base/cert_verify_proc_openssl.h',
- 'base/cert_verify_proc_win.cc',
- 'base/cert_verify_proc_win.h',
- 'base/cert_verify_result.cc',
- 'base/cert_verify_result.h',
+ 'cert/cert_trust_anchor_provider.h',
+ 'cert/cert_verifier.cc',
+ 'cert/cert_verifier.h',
+ 'cert/cert_verify_proc.cc',
+ 'cert/cert_verify_proc.h',
+ 'cert/cert_verify_proc_android.cc',
+ 'cert/cert_verify_proc_android.h',
+ 'cert/cert_verify_proc_mac.cc',
+ 'cert/cert_verify_proc_mac.h',
+ 'cert/cert_verify_proc_nss.cc',
+ 'cert/cert_verify_proc_nss.h',
+ 'cert/cert_verify_proc_openssl.cc',
+ 'cert/cert_verify_proc_openssl.h',
+ 'cert/cert_verify_proc_win.cc',
+ 'cert/cert_verify_proc_win.h',
+ 'cert/cert_verify_result.cc',
+ 'cert/cert_verify_result.h',
'base/completion_callback.h',
'base/connection_type_histograms.cc',
'base/connection_type_histograms.h',
- 'base/crl_set.cc',
- 'base/crl_set.h',
+ 'cert/crl_set.cc',
+ 'cert/crl_set.h',
Ryan Sleevi 2013/03/27 17:21:25 Please sort all modifications to this file.
Paweł Hajdan Jr. 2013/03/28 00:25:35 Done.
'base/crypto_module.h',
'base/crypto_module_nss.cc',
'base/crypto_module_openssl.cc',
@@ -139,8 +139,8 @@
'base/dns_util.h',
'base/escape.cc',
'base/escape.h',
- 'base/ev_root_ca_metadata.cc',
- 'base/ev_root_ca_metadata.h',
+ 'cert/ev_root_ca_metadata.cc',
+ 'cert/ev_root_ca_metadata.h',
'base/expiring_cache.h',
'base/file_stream.cc',
'base/file_stream.h',
@@ -192,8 +192,8 @@
'base/mime_sniffer.h',
'base/mime_util.cc',
'base/mime_util.h',
- 'base/multi_threaded_cert_verifier.cc',
- 'base/multi_threaded_cert_verifier.h',
+ 'cert/multi_threaded_cert_verifier.cc',
+ 'cert/multi_threaded_cert_verifier.h',
'base/net_error_list.h',
'base/net_errors.cc',
'base/net_errors.h',
@@ -223,8 +223,8 @@
'base/network_config_watcher_mac.h',
'base/network_delegate.cc',
'base/network_delegate.h',
- 'base/nss_cert_database.cc',
- 'base/nss_cert_database.h',
+ 'cert/nss_cert_database.cc',
+ 'cert/nss_cert_database.h',
'base/nss_memio.c',
'base/nss_memio.h',
'base/openssl_client_key_store.cc',
@@ -232,8 +232,8 @@
'base/openssl_private_key_store.h',
'base/openssl_private_key_store_android.cc',
'base/openssl_private_key_store_memory.cc',
- 'base/pem_tokenizer.cc',
- 'base/pem_tokenizer.h',
+ 'cert/pem_tokenizer.cc',
+ 'cert/pem_tokenizer.h',
'base/platform_mime_util.h',
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
'base/platform_mime_util_linux.cc',
@@ -250,8 +250,8 @@
'base/sdch_filter.h',
'base/sdch_manager.cc',
'base/sdch_manager.h',
- 'base/single_request_cert_verifier.cc',
- 'base/single_request_cert_verifier.h',
+ 'cert/single_request_cert_verifier.cc',
+ 'cert/single_request_cert_verifier.h',
'base/static_cookie_policy.cc',
'base/static_cookie_policy.h',
'base/stream_listen_socket.cc',
@@ -261,13 +261,13 @@
'base/tcp_listen_socket.h',
'base/test_data_stream.cc',
'base/test_data_stream.h',
- 'base/test_root_certs.cc',
- 'base/test_root_certs.h',
- 'base/test_root_certs_mac.cc',
- 'base/test_root_certs_nss.cc',
- 'base/test_root_certs_openssl.cc',
- 'base/test_root_certs_android.cc',
- 'base/test_root_certs_win.cc',
+ 'cert/test_root_certs.cc',
+ 'cert/test_root_certs.h',
+ 'cert/test_root_certs_mac.cc',
+ 'cert/test_root_certs_nss.cc',
+ 'cert/test_root_certs_openssl.cc',
+ 'cert/test_root_certs_android.cc',
+ 'cert/test_root_certs_win.cc',
'base/unix_domain_socket_posix.cc',
'base/unix_domain_socket_posix.h',
'base/upload_bytes_element_reader.cc',
@@ -289,29 +289,29 @@
'base/winsock_init.h',
'base/winsock_util.cc',
'base/winsock_util.h',
- 'base/x509_cert_types.cc',
- 'base/x509_cert_types.h',
- 'base/x509_cert_types_mac.cc',
- 'base/x509_cert_types_win.cc',
- 'base/x509_certificate.cc',
- 'base/x509_certificate.h',
- 'base/x509_certificate_ios.cc',
- 'base/x509_certificate_mac.cc',
- 'base/x509_certificate_net_log_param.cc',
- 'base/x509_certificate_net_log_param.h',
- 'base/x509_certificate_nss.cc',
- 'base/x509_certificate_openssl.cc',
- 'base/x509_certificate_win.cc',
- 'base/x509_util.h',
- 'base/x509_util.cc',
- 'base/x509_util_ios.cc',
- 'base/x509_util_ios.h',
- 'base/x509_util_mac.cc',
- 'base/x509_util_mac.h',
- 'base/x509_util_nss.cc',
- 'base/x509_util_nss.h',
- 'base/x509_util_openssl.cc',
- 'base/x509_util_openssl.h',
+ 'cert/x509_cert_types.cc',
+ 'cert/x509_cert_types.h',
+ 'cert/x509_cert_types_mac.cc',
+ 'cert/x509_cert_types_win.cc',
+ 'cert/x509_certificate.cc',
+ 'cert/x509_certificate.h',
+ 'cert/x509_certificate_ios.cc',
+ 'cert/x509_certificate_mac.cc',
+ 'cert/x509_certificate_net_log_param.cc',
+ 'cert/x509_certificate_net_log_param.h',
+ 'cert/x509_certificate_nss.cc',
+ 'cert/x509_certificate_openssl.cc',
+ 'cert/x509_certificate_win.cc',
+ 'cert/x509_util.h',
+ 'cert/x509_util.cc',
+ 'cert/x509_util_ios.cc',
+ 'cert/x509_util_ios.h',
+ 'cert/x509_util_mac.cc',
+ 'cert/x509_util_mac.h',
+ 'cert/x509_util_nss.cc',
+ 'cert/x509_util_nss.h',
+ 'cert/x509_util_openssl.cc',
+ 'cert/x509_util_openssl.h',
'base/zap.cc',
'base/zap.h',
'cookies/canonical_cookie.cc',
@@ -1086,19 +1086,19 @@
}],
['use_openssl==1', {
'sources!': [
- 'base/cert_database_nss.cc',
- 'base/cert_verify_proc_nss.cc',
- 'base/cert_verify_proc_nss.h',
+ 'cert/cert_database_nss.cc',
+ 'cert/cert_verify_proc_nss.cc',
+ 'cert/cert_verify_proc_nss.h',
'base/crypto_module_nss.cc',
'base/keygen_handler_nss.cc',
- 'base/nss_cert_database.cc',
- 'base/nss_cert_database.h',
+ 'cert/nss_cert_database.cc',
+ 'cert/nss_cert_database.h',
'base/nss_memio.c',
'base/nss_memio.h',
- 'base/test_root_certs_nss.cc',
- 'base/x509_certificate_nss.cc',
- 'base/x509_util_nss.cc',
- 'base/x509_util_nss.h',
+ 'cert/test_root_certs_nss.cc',
+ 'cert/x509_certificate_nss.cc',
+ 'cert/x509_util_nss.cc',
+ 'cert/x509_util_nss.h',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
'quic/crypto/aes_128_gcm_decrypter_nss.cc',
@@ -1121,9 +1121,9 @@
},
{ # else !use_openssl: remove the unneeded files
'sources!': [
- 'base/cert_database_openssl.cc',
- 'base/cert_verify_proc_openssl.cc',
- 'base/cert_verify_proc_openssl.h',
+ 'cert/cert_database_openssl.cc',
+ 'cert/cert_verify_proc_openssl.cc',
+ 'cert/cert_verify_proc_openssl.h',
'base/crypto_module_openssl.cc',
'base/keygen_handler_openssl.cc',
'base/openssl_client_key_store.cc',
@@ -1131,10 +1131,10 @@
'base/openssl_private_key_store.h',
'base/openssl_private_key_store_android.cc',
'base/openssl_private_key_store_memory.cc',
- 'base/test_root_certs_openssl.cc',
- 'base/x509_certificate_openssl.cc',
- 'base/x509_util_openssl.cc',
- 'base/x509_util_openssl.h',
+ 'cert/test_root_certs_openssl.cc',
+ 'cert/x509_certificate_openssl.cc',
+ 'cert/x509_util_openssl.cc',
+ 'cert/x509_util_openssl.h',
'quic/crypto/aes_128_gcm_decrypter_openssl.cc',
'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
@@ -1183,13 +1183,13 @@
},
{ # else: OS is not in the above list
'sources!': [
- 'base/cert_database_nss.cc',
+ 'cert/cert_database_nss.cc',
'base/crypto_module_nss.cc',
'base/keygen_handler_nss.cc',
- 'base/nss_cert_database.cc',
- 'base/nss_cert_database.h',
- 'base/test_root_certs_nss.cc',
- 'base/x509_certificate_nss.cc',
+ 'cert/nss_cert_database.cc',
+ 'cert/nss_cert_database.h',
+ 'cert/test_root_certs_nss.cc',
+ 'cert/x509_certificate_nss.cc',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
@@ -1208,8 +1208,8 @@
}],
[ 'use_nss != 1', {
'sources!': [
- 'base/cert_verify_proc_nss.cc',
- 'base/cert_verify_proc_nss.h',
+ 'cert/cert_verify_proc_nss.cc',
+ 'cert/cert_verify_proc_nss.h',
'ssl/client_cert_store_impl_nss.cc',
],
}],
@@ -1299,10 +1299,10 @@
'net_jni_headers',
],
'sources!': [
- 'base/cert_database_openssl.cc',
- 'base/cert_verify_proc_openssl.cc',
+ 'cert/cert_database_openssl.cc',
+ 'cert/cert_verify_proc_openssl.cc',
'base/openssl_private_key_store_memory.cc',
- 'base/test_root_certs_openssl.cc',
+ 'cert/test_root_certs_openssl.cc',
],
# The net/android/keystore_openssl.cc source file needs to
# access an OpenSSL-internal header.
@@ -1378,13 +1378,13 @@
'base/address_tracker_linux_unittest.cc',
'base/backoff_entry_unittest.cc',
'base/big_endian_unittest.cc',
- 'base/cert_verify_proc_unittest.cc',
- 'base/crl_set_unittest.cc',
+ 'cert/cert_verify_proc_unittest.cc',
+ 'cert/crl_set_unittest.cc',
'base/data_url_unittest.cc',
'base/directory_lister_unittest.cc',
'base/dns_util_unittest.cc',
'base/escape_unittest.cc',
- 'base/ev_root_ca_metadata_unittest.cc',
+ 'cert/ev_root_ca_metadata_unittest.cc',
'base/expiring_cache_unittest.cc',
'base/file_stream_unittest.cc',
'base/filter_unittest.cc',
@@ -1399,13 +1399,13 @@
'base/mime_util_unittest.cc',
'base/mock_filter_context.cc',
'base/mock_filter_context.h',
- 'base/multi_threaded_cert_verifier_unittest.cc',
+ 'cert/multi_threaded_cert_verifier_unittest.cc',
'base/net_log_unittest.h',
'base/net_util_unittest.cc',
'base/network_change_notifier_win_unittest.cc',
- 'base/nss_cert_database_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
'base/openssl_client_key_store_unittest.cc',
- 'base/pem_tokenizer_unittest.cc',
+ 'cert/pem_tokenizer_unittest.cc',
'base/prioritized_dispatcher_unittest.cc',
'base/priority_queue_unittest.cc',
'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
@@ -1413,18 +1413,18 @@
'base/static_cookie_policy_unittest.cc',
'base/tcp_listen_socket_unittest.cc',
'base/tcp_listen_socket_unittest.h',
- 'base/test_certificate_data.h',
+ 'cert/test_certificate_data.h',
'base/test_completion_callback_unittest.cc',
'base/unix_domain_socket_posix_unittest.cc',
'base/upload_bytes_element_reader_unittest.cc',
'base/upload_data_stream_unittest.cc',
'base/upload_file_element_reader_unittest.cc',
'base/url_util_unittest.cc',
- 'base/x509_certificate_unittest.cc',
- 'base/x509_cert_types_unittest.cc',
- 'base/x509_util_unittest.cc',
- 'base/x509_util_nss_unittest.cc',
- 'base/x509_util_openssl_unittest.cc',
+ 'cert/x509_certificate_unittest.cc',
+ 'cert/x509_cert_types_unittest.cc',
+ 'cert/x509_util_unittest.cc',
+ 'cert/x509_util_nss_unittest.cc',
+ 'cert/x509_util_openssl_unittest.cc',
'cookies/canonical_cookie_unittest.cc',
'cookies/cookie_monster_unittest.cc',
'cookies/cookie_store_unittest.h',
@@ -1723,7 +1723,7 @@
],
}, { # else use_glib == 0: !posix || mac
'sources!': [
- 'base/nss_cert_database_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
],
},
],
@@ -1759,14 +1759,14 @@
# TODO(bulach): Add equivalent tests when the underlying
# functionality is ported to OpenSSL.
'sources!': [
- 'base/nss_cert_database_unittest.cc',
- 'base/x509_util_nss_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
+ 'cert/x509_util_nss_unittest.cc',
'ssl/client_cert_store_impl_unittest.cc',
],
}, { # else !use_openssl: remove the unneeded files
'sources!': [
'base/openssl_client_key_store_unittest.cc',
- 'base/x509_util_openssl_unittest.cc',
+ 'cert/x509_util_openssl_unittest.cc',
'socket/ssl_client_socket_openssl_unittest.cc',
],
},
@@ -1922,7 +1922,7 @@
}],
[ 'OS != "win" and OS != "mac"', {
'sources!': [
- 'base/x509_cert_types_unittest.cc',
+ 'cert/x509_cert_types_unittest.cc',
],
}],
],
@@ -1985,12 +1985,12 @@
'sources': [
'base/capturing_net_log.cc',
'base/capturing_net_log.h',
- 'base/cert_test_util.cc',
- 'base/cert_test_util.h',
+ 'test/cert_test_util.cc',
+ 'test/cert_test_util.h',
'base/load_timing_info_test_util.cc',
'base/load_timing_info_test_util.h',
- 'base/mock_cert_verifier.cc',
- 'base/mock_cert_verifier.h',
+ 'cert/mock_cert_verifier.cc',
+ 'cert/mock_cert_verifier.h',
'base/mock_file_stream.cc',
'base/mock_file_stream.h',
'base/test_completion_callback.cc',
« net/cert/test_certificate_data.h ('K') | « net/http/transport_security_state_unittest.cc ('k') | net/proxy/proxy_script_fetcher_impl.cc » ('j') | remoting/host/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698