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

Unified Diff: chrome/browser/certificate_manager_model.cc

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fixes 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 6989f723dea466d84a4757c467d724845258854a..8288f827b0ed7c6d6a42c94c4a6016edefbcc70c 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -133,8 +133,10 @@ 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, not_imported);
+ bool result = cert_db_.ImportServerCert(certificates, trust_bits,
+ not_imported);
if (result && not_imported->size() != certificates.size())
Refresh();
return result;

Powered by Google App Engine
This is Rietveld 408576698