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

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: remove openssl stubs, replace TrustBits::TRUST_TERMINAL_RECORD with EXPLICIT_DISTRUST Created 8 years, 7 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 'spdy/spdy_session.cc', 687 'spdy/spdy_session.cc',
688 'spdy/spdy_session.h', 688 'spdy/spdy_session.h',
689 'spdy/spdy_session_pool.cc', 689 'spdy/spdy_session_pool.cc',
690 'spdy/spdy_session_pool.h', 690 'spdy/spdy_session_pool.h',
691 'spdy/spdy_stream.cc', 691 'spdy/spdy_stream.cc',
692 'spdy/spdy_stream.h', 692 'spdy/spdy_stream.h',
693 'spdy/spdy_websocket_stream.cc', 693 'spdy/spdy_websocket_stream.cc',
694 'spdy/spdy_websocket_stream.h', 694 'spdy/spdy_websocket_stream.h',
695 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 695 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
696 'third_party/mozilla_security_manager/nsKeygenHandler.h', 696 'third_party/mozilla_security_manager/nsKeygenHandler.h',
697 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
698 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
699 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 697 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
700 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 698 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
701 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 699 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
702 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 700 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
703 'udp/datagram_client_socket.h', 701 'udp/datagram_client_socket.h',
704 'udp/datagram_server_socket.h', 702 'udp/datagram_server_socket.h',
705 'udp/datagram_socket.h', 703 'udp/datagram_socket.h',
706 'udp/udp_client_socket.cc', 704 'udp/udp_client_socket.cc',
707 'udp/udp_client_socket.h', 705 'udp/udp_client_socket.h',
708 'udp/udp_data_transfer_param.cc', 706 'udp/udp_data_transfer_param.cc',
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 'socket/nss_ssl_util.cc', 848 'socket/nss_ssl_util.cc',
851 'socket/nss_ssl_util.h', 849 'socket/nss_ssl_util.h',
852 'socket/ssl_client_socket_nss.cc', 850 'socket/ssl_client_socket_nss.cc',
853 'socket/ssl_client_socket_nss.h', 851 'socket/ssl_client_socket_nss.h',
854 'socket/ssl_server_socket_nss.cc', 852 'socket/ssl_server_socket_nss.cc',
855 'socket/ssl_server_socket_nss.h', 853 'socket/ssl_server_socket_nss.h',
856 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 854 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
857 'third_party/mozilla_security_manager/nsKeygenHandler.h', 855 'third_party/mozilla_security_manager/nsKeygenHandler.h',
858 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 856 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
859 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 857 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
860 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
861 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
862 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 858 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
863 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 859 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
864 ], 860 ],
865 }, 861 },
866 { # else !use_openssl: remove the unneeded files 862 { # else !use_openssl: remove the unneeded files
867 'sources!': [ 863 'sources!': [
868 'base/cert_database_openssl.cc', 864 'base/cert_database_openssl.cc',
869 'base/cert_verify_proc_openssl.cc', 865 'base/cert_verify_proc_openssl.cc',
870 'base/cert_verify_proc_openssl.h', 866 'base/cert_verify_proc_openssl.h',
871 'base/crypto_module_openssl.cc', 867 'base/crypto_module_openssl.cc',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 'base/crypto_module_nss.cc', 920 'base/crypto_module_nss.cc',
925 'base/keygen_handler_nss.cc', 921 'base/keygen_handler_nss.cc',
926 'base/test_root_certs_nss.cc', 922 'base/test_root_certs_nss.cc',
927 'base/x509_certificate_nss.cc', 923 'base/x509_certificate_nss.cc',
928 'ocsp/nss_ocsp.cc', 924 'ocsp/nss_ocsp.cc',
929 'ocsp/nss_ocsp.h', 925 'ocsp/nss_ocsp.h',
930 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 926 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
931 'third_party/mozilla_security_manager/nsKeygenHandler.h', 927 'third_party/mozilla_security_manager/nsKeygenHandler.h',
932 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 928 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
933 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 929 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
934 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
935 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
936 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 930 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
937 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 931 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
938 ], 932 ],
939 }, 933 },
940 ], 934 ],
941 [ 'toolkit_uses_gtk == 1', { 935 [ 'toolkit_uses_gtk == 1', {
942 'dependencies': [ 936 'dependencies': [
943 '../build/linux/system.gyp:gdk', 937 '../build/linux/system.gyp:gdk',
944 ], 938 ],
945 }], 939 }],
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 'tools/dump_cache/url_to_filename_encoder.cc', 1851 'tools/dump_cache/url_to_filename_encoder.cc',
1858 'tools/dump_cache/url_to_filename_encoder.h', 1852 'tools/dump_cache/url_to_filename_encoder.h',
1859 'tools/dump_cache/url_utilities.h', 1853 'tools/dump_cache/url_utilities.h',
1860 'tools/dump_cache/url_utilities.cc', 1854 'tools/dump_cache/url_utilities.cc',
1861 ], 1855 ],
1862 }, 1856 },
1863 ], 1857 ],
1864 }], 1858 }],
1865 ], 1859 ],
1866 } 1860 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698