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

Side by Side Diff: net/net.gyp

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 'spdy/spdy_session.cc', 690 'spdy/spdy_session.cc',
691 'spdy/spdy_session.h', 691 'spdy/spdy_session.h',
692 'spdy/spdy_session_pool.cc', 692 'spdy/spdy_session_pool.cc',
693 'spdy/spdy_session_pool.h', 693 'spdy/spdy_session_pool.h',
694 'spdy/spdy_stream.cc', 694 'spdy/spdy_stream.cc',
695 'spdy/spdy_stream.h', 695 'spdy/spdy_stream.h',
696 'spdy/spdy_websocket_stream.cc', 696 'spdy/spdy_websocket_stream.cc',
697 'spdy/spdy_websocket_stream.h', 697 'spdy/spdy_websocket_stream.h',
698 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 698 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
699 'third_party/mozilla_security_manager/nsKeygenHandler.h', 699 'third_party/mozilla_security_manager/nsKeygenHandler.h',
700 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
701 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
702 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 700 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
703 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 701 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
704 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 702 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
705 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 703 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
706 'udp/datagram_client_socket.h', 704 'udp/datagram_client_socket.h',
707 'udp/datagram_server_socket.h', 705 'udp/datagram_server_socket.h',
708 'udp/datagram_socket.h', 706 'udp/datagram_socket.h',
709 'udp/udp_client_socket.cc', 707 'udp/udp_client_socket.cc',
710 'udp/udp_client_socket.h', 708 'udp/udp_client_socket.h',
711 'udp/udp_data_transfer_param.cc', 709 'udp/udp_data_transfer_param.cc',
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 'socket/nss_ssl_util.cc', 853 'socket/nss_ssl_util.cc',
856 'socket/nss_ssl_util.h', 854 'socket/nss_ssl_util.h',
857 'socket/ssl_client_socket_nss.cc', 855 'socket/ssl_client_socket_nss.cc',
858 'socket/ssl_client_socket_nss.h', 856 'socket/ssl_client_socket_nss.h',
859 'socket/ssl_server_socket_nss.cc', 857 'socket/ssl_server_socket_nss.cc',
860 'socket/ssl_server_socket_nss.h', 858 'socket/ssl_server_socket_nss.h',
861 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 859 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
862 'third_party/mozilla_security_manager/nsKeygenHandler.h', 860 'third_party/mozilla_security_manager/nsKeygenHandler.h',
863 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 861 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
864 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 862 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
865 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
866 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
867 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 863 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
868 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 864 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
869 ], 865 ],
870 }, 866 },
871 { # else !use_openssl: remove the unneeded files 867 { # else !use_openssl: remove the unneeded files
872 'sources!': [ 868 'sources!': [
873 'base/cert_database_openssl.cc', 869 'base/cert_database_openssl.cc',
874 'base/cert_verify_proc_openssl.cc', 870 'base/cert_verify_proc_openssl.cc',
875 'base/cert_verify_proc_openssl.h', 871 'base/cert_verify_proc_openssl.h',
876 'base/crypto_module_openssl.cc', 872 'base/crypto_module_openssl.cc',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 'base/crypto_module_nss.cc', 925 'base/crypto_module_nss.cc',
930 'base/keygen_handler_nss.cc', 926 'base/keygen_handler_nss.cc',
931 'base/test_root_certs_nss.cc', 927 'base/test_root_certs_nss.cc',
932 'base/x509_certificate_nss.cc', 928 'base/x509_certificate_nss.cc',
933 'ocsp/nss_ocsp.cc', 929 'ocsp/nss_ocsp.cc',
934 'ocsp/nss_ocsp.h', 930 'ocsp/nss_ocsp.h',
935 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 931 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
936 'third_party/mozilla_security_manager/nsKeygenHandler.h', 932 'third_party/mozilla_security_manager/nsKeygenHandler.h',
937 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 933 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
938 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 934 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
939 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
940 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
941 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 935 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
942 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 936 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
943 ], 937 ],
944 }, 938 },
945 ], 939 ],
946 [ 'toolkit_uses_gtk == 1', { 940 [ 'toolkit_uses_gtk == 1', {
947 'dependencies': [ 941 'dependencies': [
948 '../build/linux/system.gyp:gdk', 942 '../build/linux/system.gyp:gdk',
949 ], 943 ],
950 }], 944 }],
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 'tools/dump_cache/url_to_filename_encoder.cc', 1888 'tools/dump_cache/url_to_filename_encoder.cc',
1895 'tools/dump_cache/url_to_filename_encoder.h', 1889 'tools/dump_cache/url_to_filename_encoder.h',
1896 'tools/dump_cache/url_utilities.h', 1890 'tools/dump_cache/url_utilities.h',
1897 'tools/dump_cache/url_utilities.cc', 1891 'tools/dump_cache/url_utilities.cc',
1898 ], 1892 ],
1899 }, 1893 },
1900 ], 1894 ],
1901 }], 1895 }],
1902 ], 1896 ],
1903 } 1897 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698