diff options
Diffstat (limited to 'src/core/net/system_network_context_manager.cpp')
| -rw-r--r-- | src/core/net/system_network_context_manager.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp index a804ff8f7..beafa6a6d 100644 --- a/src/core/net/system_network_context_manager.cpp +++ b/src/core/net/system_network_context_manager.cpp @@ -39,7 +39,7 @@ network::mojom::HttpAuthStaticParamsPtr CreateHttpAuthStaticParams() { network::mojom::HttpAuthStaticParamsPtr auth_static_params = network::mojom::HttpAuthStaticParams::New(); - auth_static_params->supported_schemes = { "basic", "digest", "ntlm", "negotiate" }; + auth_static_params->allowed_schemes = { "basic", "digest", "ntlm", "negotiate" }; return auth_static_params; } @@ -186,22 +186,33 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(network::mojom::Networ network_service->ConfigureHttpAuthPrefs(CreateHttpAuthDynamicParams()); // Configure the Certificate Transparency logs. - std::vector<std::pair<std::string, base::TimeDelta>> disqualified_logs = + std::vector<std::pair<std::string, base::Time>> disqualified_logs = certificate_transparency::GetDisqualifiedLogs(); std::vector<network::mojom::CTLogInfoPtr> log_list_mojo; for (const auto &ct_log : certificate_transparency::GetKnownLogs()) { network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); log_info->public_key = std::string(ct_log.log_key, ct_log.log_key_length); + log_info->id = crypto::SHA256HashString(log_info->public_key); log_info->name = ct_log.log_name; + log_info->current_operator = ct_log.current_operator; - std::string log_id = crypto::SHA256HashString(log_info->public_key); auto it = std::lower_bound( - std::begin(disqualified_logs), std::end(disqualified_logs), log_id, + std::begin(disqualified_logs), std::end(disqualified_logs), log_info->id, [](const auto& disqualified_log, const std::string& log_id) { return disqualified_log.first < log_id; }); - if (it != std::end(disqualified_logs) && it->first == log_id) + if (it != std::end(disqualified_logs) && it->first == log_info->id) log_info->disqualified_at = it->second; + + for (size_t i = 0; i < ct_log.previous_operators_length; i++) { + const auto& op = ct_log.previous_operators[i]; + network::mojom::PreviousOperatorEntryPtr previous_operator = + network::mojom::PreviousOperatorEntry::New(); + previous_operator->name = op.name; + previous_operator->end_time = op.end_time; + log_info->previous_operators.push_back(std::move(previous_operator)); + } + log_list_mojo.push_back(std::move(log_info)); } network_service->UpdateCtLogList( |