Change name of TLS handshaker's delegate_ member to handshaker_delegate_.
TLS server handshaker is a subclass of QuicStream. QuicStream has a another delegate member called session_delegate. This change is to make it clear on which delegate is called for each piece of code.
gfe-relnote: name change only. Not protected.
PiperOrigin-RevId: 294791081
Change-Id: I22ee62753d21e4052822254cb9715dfde0cff72f
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index ece7a05..350a9ae 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -286,8 +286,8 @@
return;
}
handshake_confirmed_ = true;
- delegate()->DiscardOldEncryptionKey(ENCRYPTION_HANDSHAKE);
- delegate()->DiscardOldDecryptionKey(ENCRYPTION_HANDSHAKE);
+ handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_HANDSHAKE);
+ handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_HANDSHAKE);
}
void TlsClientHandshaker::AdvanceHandshake() {
@@ -394,7 +394,7 @@
crypto_negotiated_params_->peer_signature_algorithm =
SSL_get_peer_signature_algorithm(ssl());
- delegate()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
+ handshaker_delegate()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
}
enum ssl_verify_result_t TlsClientHandshaker::VerifyCert(uint8_t* out_alert) {
@@ -465,8 +465,8 @@
if (level == ENCRYPTION_HANDSHAKE &&
state_ < STATE_ENCRYPTION_HANDSHAKE_DATA_SENT) {
state_ = STATE_ENCRYPTION_HANDSHAKE_DATA_SENT;
- delegate()->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
- delegate()->DiscardOldDecryptionKey(ENCRYPTION_INITIAL);
+ handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
+ handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_INITIAL);
}
TlsHandshaker::WriteMessage(level, data);
}
diff --git a/quic/core/tls_handshaker.cc b/quic/core/tls_handshaker.cc
index 4558928..b452f29 100644
--- a/quic/core/tls_handshaker.cc
+++ b/quic/core/tls_handshaker.cc
@@ -15,7 +15,7 @@
namespace quic {
TlsHandshaker::TlsHandshaker(QuicCryptoStream* stream, QuicSession* session)
- : stream_(stream), delegate_(session) {}
+ : stream_(stream), handshaker_delegate_(session) {}
TlsHandshaker::~TlsHandshaker() {}
@@ -73,8 +73,9 @@
QuicDecrypter::CreateFromCipherSuite(
SSL_CIPHER_get_id(SSL_get_pending_cipher(ssl())));
CryptoUtils::SetKeyAndIV(Prf(), read_secret, decrypter.get());
- delegate_->OnNewEncryptionKeyAvailable(level, std::move(encrypter));
- return delegate_->OnNewDecryptionKeyAvailable(
+ handshaker_delegate_->OnNewEncryptionKeyAvailable(level,
+ std::move(encrypter));
+ return handshaker_delegate_->OnNewDecryptionKeyAvailable(
level, std::move(decrypter),
/*set_alternative_decrypter=*/false,
/*latch_once_used=*/false);
diff --git a/quic/core/tls_handshaker.h b/quic/core/tls_handshaker.h
index d6df69b..80615a1 100644
--- a/quic/core/tls_handshaker.h
+++ b/quic/core/tls_handshaker.h
@@ -67,7 +67,9 @@
SSL* ssl() const { return tls_connection()->ssl(); }
QuicCryptoStream* stream() { return stream_; }
- HandshakerDelegateInterface* delegate() { return delegate_; }
+ HandshakerDelegateInterface* handshaker_delegate() {
+ return handshaker_delegate_;
+ }
// SetEncryptionSecret provides the encryption secret to use at a particular
// encryption level. The secrets provided here are the ones from the TLS 1.3
@@ -97,7 +99,7 @@
private:
QuicCryptoStream* stream_;
- HandshakerDelegateInterface* delegate_;
+ HandshakerDelegateInterface* handshaker_delegate_;
QuicErrorCode parser_error_ = QUIC_NO_ERROR;
std::string parser_error_detail_;
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 1c95d2b..3a99875 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -115,8 +115,8 @@
if (level == ENCRYPTION_HANDSHAKE &&
state_ < STATE_ENCRYPTION_HANDSHAKE_DATA_PROCESSED) {
state_ = STATE_ENCRYPTION_HANDSHAKE_DATA_PROCESSED;
- delegate()->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
- delegate()->DiscardOldDecryptionKey(ENCRYPTION_INITIAL);
+ handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
+ handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_INITIAL);
}
}
@@ -287,9 +287,9 @@
}
crypto_negotiated_params_->key_exchange_group = SSL_get_curve_id(ssl());
- delegate()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
- delegate()->DiscardOldEncryptionKey(ENCRYPTION_HANDSHAKE);
- delegate()->DiscardOldDecryptionKey(ENCRYPTION_HANDSHAKE);
+ handshaker_delegate()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
+ handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_HANDSHAKE);
+ handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_HANDSHAKE);
}
ssl_private_key_result_t TlsServerHandshaker::PrivateKeySign(
