bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 69.0.3464.0 (#567918)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-06-18 18:08:20 -04:00
parent 3c3045a5cb
commit 35830c88e5
51 changed files with 538 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/ssl_host_state_delegate.cc
View File

@@ -17,8 +17,7 @@ CertPolicy::~CertPolicy() {}
// For an allowance, we consider a given |cert| to be a match to a saved
// allowed cert if the |error| is an exact match to or subset of the errors
// in the saved CertStatus.
bool CertPolicy::Check(const net::X509Certificate& cert,
net::CertStatus error) const {
bool CertPolicy::Check(const net::X509Certificate& cert, int error) const {
net::SHA256HashValue fingerprint = cert.CalculateChainFingerprint256();
const auto& allowed_iter = allowed_.find(fingerprint);
if ((allowed_iter != allowed_.end()) && (allowed_iter->second & error) &&
@@ -28,8 +27,7 @@ bool CertPolicy::Check(const net::X509Certificate& cert,
return false;
}
void CertPolicy::Allow(const net::X509Certificate& cert,
net::CertStatus error) {
void CertPolicy::Allow(const net::X509Certificate& cert, int error) {
// If this same cert had already been saved with a different error status,
// this will replace it with the new error status.
net::SHA256HashValue fingerprint = cert.CalculateChainFingerprint256();
@@ -59,7 +57,7 @@ bool CefSSLHostStateDelegate::DidHostRunInsecureContent(
void CefSSLHostStateDelegate::AllowCert(const std::string& host,
const net::X509Certificate& cert,
net::CertStatus error) {
int error) {
cert_policy_for_host_[host].Allow(cert, error);
}
@@ -84,7 +82,7 @@ void CefSSLHostStateDelegate::Clear(
SSLHostStateDelegate::CertJudgment CefSSLHostStateDelegate::QueryPolicy(
const std::string& host,
const net::X509Certificate& cert,
net::CertStatus error,
int error,
bool* expired_previous_decision) {
return cert_policy_for_host_[host].Check(cert, error)
? SSLHostStateDelegate::ALLOWED