| Index: chrome/browser/ssl/ssl_blocking_page.cc
|
| diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
|
| index 97148f38d5d3a178c6453f327218e67e353500fe..2949d194e72e50079f320d4c17488a2c85401b14 100644
|
| --- a/chrome/browser/ssl/ssl_blocking_page.cc
|
| +++ b/chrome/browser/ssl/ssl_blocking_page.cc
|
| @@ -43,6 +43,7 @@
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| +#include "content/public/browser/signed_certificate_timestamp_store.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/common/ssl_status.h"
|
| @@ -290,15 +291,24 @@ void SSLBlockingPage::PopulateInterstitialStrings(
|
| }
|
|
|
| void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
|
| - int cert_id = content::CertStore::GetInstance()->StoreCert(
|
| - ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID());
|
| + const int process_id = web_contents()->GetRenderProcessHost()->GetID();
|
| + const int cert_id = content::CertStore::GetInstance()->StoreCert(
|
| + ssl_info_.cert.get(), process_id);
|
| DCHECK(cert_id);
|
|
|
| - entry->GetSSL().security_style =
|
| - content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
|
| - entry->GetSSL().cert_id = cert_id;
|
| - entry->GetSSL().cert_status = ssl_info_.cert_status;
|
| - entry->GetSSL().security_bits = ssl_info_.security_bits;
|
| + content::SignedCertificateTimestampStore* sct_store(
|
| + content::SignedCertificateTimestampStore::GetInstance());
|
| + content::SignedCertificateTimestampIDStatusList sct_ids;
|
| + for (const auto& sct_and_status : ssl_info_.signed_certificate_timestamps) {
|
| + const int sct_id(sct_store->Store(sct_and_status.sct.get(), process_id));
|
| + DCHECK(sct_id);
|
| + sct_ids.push_back(content::SignedCertificateTimestampIDAndStatus(
|
| + sct_id, sct_and_status.status));
|
| + }
|
| +
|
| + entry->GetSSL() =
|
| + content::SSLStatus(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id,
|
| + sct_ids, ssl_info_);
|
| }
|
|
|
| void SSLBlockingPage::SetSSLCertReporterForTesting(
|
|
|