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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/cros/onc_network_parser.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: Created 8 years, 9 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
« chrome/browser/certificate_manager_model.h ('K') | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/webui/options2/certificate_manager_handler2.cc » ('j') | net/base/cert_database.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/onc_network_parser.cc
diff --git a/chrome/browser/chromeos/cros/onc_network_parser.cc b/chrome/browser/chromeos/cros/onc_network_parser.cc
index ef8fb285e063105d5df20d88f93d27709cb6ac2d..5c6d2ea46f432f55b4e059ef134671f514c830ab 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser.cc
@@ -922,12 +922,12 @@ OncNetworkParser::ParseServerOrCaCertificate(
cert_list.push_back(x509_cert);
net::CertDatabase::ImportCertFailureList failures;
bool success = false;
+ net::CertDatabase::TrustBits trust = web_trust ?
+ net::CertDatabase::TRUSTED_SSL :
+ net::CertDatabase::UNTRUSTED;
if (cert_type == "Server") {
- success = cert_database.ImportServerCert(cert_list, &failures);
+ success = cert_database.ImportServerCert(cert_list, trust, &failures);
} else { // Authority cert
- net::CertDatabase::TrustBits trust = web_trust ?
- net::CertDatabase::TRUSTED_SSL :
- net::CertDatabase::UNTRUSTED;
success = cert_database.ImportCACerts(cert_list, trust, &failures);
}
if (!failures.empty()) {
« chrome/browser/certificate_manager_model.h ('K') | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/webui/options2/certificate_manager_handler2.cc » ('j') | net/base/cert_database.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698