summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 05:59:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 05:59:56 +0000
commitad40b2190329c77463db06fb6982a0e26dc6ae05 (patch)
tree8db6d516f6b789d0c4e1bc7dcaf2f4c909490ac6 /net/net.gyp
parent2d7b82c64aba940073da269f302403110f2f1574 (diff)
downloadchromium_src-ad40b2190329c77463db06fb6982a0e26dc6ae05.zip
chromium_src-ad40b2190329c77463db06fb6982a0e26dc6ae05.tar.gz
chromium_src-ad40b2190329c77463db06fb6982a0e26dc6ae05.tar.bz2
Reland: Fix imported server certs being distrusted in NSS 3.13.
Add support for intentionally distrusting certs. (Not exposed in the UI yet.) BUG=116411 TEST=CertDatabaseNSSTest TBR=stevenjb@chromium.org,jhawkins@chromium.org Review URL: https://chromiumcodereview.appspot.com/10458069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 313e11d..d1a3b46 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -696,8 +696,6 @@
'spdy/spdy_websocket_stream.h',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
@@ -861,8 +859,6 @@
'third_party/mozilla_security_manager/nsKeygenHandler.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],
@@ -935,8 +931,6 @@
'third_party/mozilla_security_manager/nsKeygenHandler.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],