Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: net/spdy/spdy_session.cc

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename all the things Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 8a57d928146046d77f50030d23189a6f2cf3e158..6f79dd45b5118e4eb368eaa291e7c69ef6af5971 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -392,7 +392,7 @@ net::Error SpdySession::InitializeWithSocket(
protocol = protocol_negotiated;
}
- if (ssl_socket->WasOriginBoundCertSent()) {
+ if (ssl_socket->WasDomainBoundCertSent()) {
// According to the SPDY spec, the credential associated with the TLS
// connection is stored in slot[0].
credential_state_.SetHasCredential(host_port_pair());
@@ -584,7 +584,7 @@ bool SpdySession::NeedsCredentials(const HostPortPair& origin) const {
SSLClientSocket* ssl_socket = GetSSLClientSocket();
if (ssl_socket->protocol_negotiated() < SSLClientSocket::kProtoSPDY3)
return false;
- if (!ssl_socket->WasOriginBoundCertSent())
+ if (!ssl_socket->WasDomainBoundCertSent())
return false;
return !credential_state_.HasCredential(origin);
}
@@ -661,7 +661,7 @@ int SpdySession::WriteCredentialFrame(const std::string& origin,
spki_piece.data() + spki_piece.size());
scoped_ptr<crypto::ECPrivateKey> private_key(
crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
- OriginBoundCertService::kEPKIPassword, key_data, spki));
+ ServerBoundCertService::kEPKIPassword, key_data, spki));
scoped_ptr<crypto::ECSignatureCreator> creator(
crypto::ECSignatureCreator::Create(private_key.get()));
creator->Sign(secret, arraysize(secret), &proof);
@@ -1252,16 +1252,16 @@ bool SpdySession::GetSSLCertRequestInfo(
return true;
}
-OriginBoundCertService* SpdySession::GetOriginBoundCertService() const {
+ServerBoundCertService* SpdySession::GetServerBoundCertService() const {
if (!is_secure_)
return NULL;
- return GetSSLClientSocket()->GetOriginBoundCertService();
+ return GetSSLClientSocket()->GetServerBoundCertService();
}
-SSLClientCertType SpdySession::GetOriginBoundCertType() const {
+SSLClientCertType SpdySession::GetDomainBoundCertType() const {
if (!is_secure_)
return CLIENT_CERT_INVALID_TYPE;
- return GetSSLClientSocket()->origin_bound_cert_type();
+ return GetSSLClientSocket()->domain_bound_cert_type();
}
void SpdySession::OnError(int error_code) {

Powered by Google App Engine
This is Rietveld 408576698