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

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: 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
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chromeos/cros/onc_network_parser_unittest.cc » ('j') | chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js » ('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 8919b76e9f7a25b6a5e8c841ac2d6b46e8907ea8..5a5b6734049cddd97d7a1c50404e723e3f8c1483 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser.cc
@@ -929,12 +929,12 @@ OncNetworkParser::ParseServerOrCaCertificate(
cert_list.push_back(x509_cert);
net::CertDatabase::ImportCertFailureList failures;
bool success = false;
+ net::CertDatabase::TrustBits trust = web_trust ?
wtc 2012/05/16 23:37:12 Please find out if web_trust should apply to a ser
mattm 2012/05/18 03:40:54 I pinged gspencer to verify but haven't received a
+ 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()) {
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chromeos/cros/onc_network_parser_unittest.cc » ('j') | chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698