diff options
Diffstat (limited to 'net/spdy/spdy_session.cc')
| -rw-r--r-- | net/spdy/spdy_session.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index d273291..fb1a653 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -315,7 +315,7 @@ net::Error SpdySession::InitializeWithSocket( } SSLClientSocket* ssl_socket = GetSSLClientSocket(); - if (ssl_socket && ssl_socket->WasDomainBoundCertSent()) { + if (ssl_socket && ssl_socket->WasChannelIDSent()) { // According to the SPDY spec, the credential associated with the TLS // connection is stored in slot[1]. credential_state_.SetHasCredential(GURL("https://" + @@ -352,7 +352,8 @@ bool SpdySession::VerifyDomainAuthentication(const std::string& domain) { if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) return true; // This is not a secure session, so all domains are okay. - return !ssl_info.client_cert_sent && ssl_info.cert->VerifyNameMatch(domain); + return !ssl_info.channel_id_sent && !ssl_info.client_cert_sent && + ssl_info.cert->VerifyNameMatch(domain); } int SpdySession::GetPushStream( @@ -512,7 +513,7 @@ bool SpdySession::NeedsCredentials() const { SSLClientSocket* ssl_socket = GetSSLClientSocket(); if (ssl_socket->GetNegotiatedProtocol() < kProtoSPDY3) return false; - return ssl_socket->WasDomainBoundCertSent(); + return ssl_socket->WasChannelIDSent(); } void SpdySession::AddPooledAlias(const HostPortProxyPair& alias) { @@ -1193,12 +1194,6 @@ ServerBoundCertService* SpdySession::GetServerBoundCertService() const { return GetSSLClientSocket()->GetServerBoundCertService(); } -SSLClientCertType SpdySession::GetDomainBoundCertType() const { - if (!is_secure_) - return CLIENT_CERT_INVALID_TYPE; - return GetSSLClientSocket()->domain_bound_cert_type(); -} - void SpdySession::OnError(SpdyFramer::SpdyError error_code) { RecordProtocolErrorHistogram( static_cast<SpdyProtocolErrorDetails>(error_code)); |