diff options
| author | falken@google.com <falken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 04:26:30 +0000 |
|---|---|---|
| committer | falken@google.com <falken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 04:26:30 +0000 |
| commit | 440d59908056a535d4df7e2bdb4ababe122286a9 (patch) | |
| tree | e26e761c534f3e44240808eccad9292d71f1c77f /chrome/browser/certificate_manager_model.cc | |
| parent | c4ca3b454d7a68dd8841d0b2f03f0f81c3cc2a7d (diff) | |
| download | chromium_src-440d59908056a535d4df7e2bdb4ababe122286a9.zip chromium_src-440d59908056a535d4df7e2bdb4ababe122286a9.tar.gz chromium_src-440d59908056a535d4df7e2bdb4ababe122286a9.tar.bz2 | |
Revert 139719 - Fix imported server certs being distrusted in NSS 3.13.
Reverting as it seemed to break net_unittests on Linux(dbg)(shared).
Add support for intentionally distrusting certs. (Not exposed in the UI yet.)
BUG=116411
TEST=CertDatabaseNSSTest
Review URL: https://chromiumcodereview.appspot.com/9940001
TBR=mattm@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10440110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/certificate_manager_model.cc')
| -rw-r--r-- | chrome/browser/certificate_manager_model.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index e44a0b6..22af7e8 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/chrome/browser/certificate_manager_model.cc @@ -131,10 +131,8 @@ bool CertificateManagerModel::ImportCACerts( bool CertificateManagerModel::ImportServerCert( const net::CertificateList& certificates, - net::CertDatabase::TrustBits trust_bits, net::CertDatabase::ImportCertFailureList* not_imported) { - bool result = cert_db_.ImportServerCert(certificates, trust_bits, - not_imported); + bool result = cert_db_.ImportServerCert(certificates, not_imported); if (result && not_imported->size() != certificates.size()) Refresh(); return result; |