diff options
| author | unsafe@trevp.net <unsafe@trevp.net@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:06:09 +0000 |
|---|---|---|
| committer | unsafe@trevp.net <unsafe@trevp.net@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:06:09 +0000 |
| commit | 843329e98717e263ae5751323e8716a3f1e9c4f6 (patch) | |
| tree | 136dc64a78731d5fc544826668ff0431c594b10e /net/socket_stream | |
| parent | 9aaee227a933ad08eb3a493aa0e5e0e766eb1329 (diff) | |
| download | chromium_src-843329e98717e263ae5751323e8716a3f1e9c4f6.zip chromium_src-843329e98717e263ae5751323e8716a3f1e9c4f6.tar.gz chromium_src-843329e98717e263ae5751323e8716a3f1e9c4f6.tar.bz2 | |
Renames some DomainState functions for increased clarity.
Updates consumers of DomainState to rely on these functions
instead of relying on GetDomainState() returning true indicating
HSTS semantics, as this would likely become a problem later on
(eg: as DomainState is extended to store non-HSTS data like
HPKP or TACK)
BUG=156152
TBR=thakis
TBR=eroman
Review URL: https://chromiumcodereview.appspot.com/11929019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 9 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream_job.cc | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 73d5a2b..bf53d17 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -1260,12 +1260,11 @@ int SocketStream::HandleCertificateError(int result) { TransportSecurityState::DomainState domain_state; DCHECK(context_); - const bool fatal = - context_->transport_security_state() && - context_->transport_security_state()->GetDomainState( - url_.host(), + const bool fatal = context_->transport_security_state() && + context_->transport_security_state()->GetDomainState(url_.host(), SSLConfigService::IsSNIAvailable(context_->ssl_config_service()), - &domain_state); + &domain_state) && + domain_state.ShouldSSLErrorsBeFatal(); delegate_->OnSSLCertificateError(this, ssl_info, fatal); return ERR_IO_PENDING; diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 106656e..3bbb6b6 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -29,7 +29,7 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( TransportSecurityState::DomainState domain_state; if (url.scheme() == "ws" && sts && sts->GetDomainState( url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) && - domain_state.ShouldRedirectHTTPToHTTPS()) { + domain_state.ShouldUpgradeToSSL()) { url_canon::Replacements<char> replacements; static const char kNewScheme[] = "wss"; replacements.SetScheme(kNewScheme, |