gfe-relnote: In QUIC, rename IsCryptoHandshakeConfirmed to OneRttKeysAvailable in QuicSession. Renaming only, not protected. PiperOrigin-RevId: 289699593 Change-Id: I9bd673dec692662fc7e92b2b7ec74d926cdef3a8
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index 5df724c..d177419 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -1055,7 +1055,7 @@ } DCHECK(perspective() == Perspective::IS_CLIENT); - if (IsCryptoHandshakeConfirmed()) { + if (OneRttKeysAvailable()) { SendMaxPushId(); } }
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index a2c77e7..a0de873 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -467,7 +467,7 @@ EXPECT_TRUE(session_.self_address().IsInitialized()); } -TEST_P(QuicSpdySessionTestServer, IsCryptoHandshakeConfirmed) { +TEST_P(QuicSpdySessionTestServer, OneRttKeysAvailable) { if (VersionUsesHttp3(transport_version())) { MockPacketWriter* writer = static_cast<MockPacketWriter*>( QuicConnectionPeer::GetWriter(session_.connection())); @@ -475,10 +475,10 @@ .Times(1) .WillRepeatedly(Return(WriteResult(WRITE_STATUS_OK, 0))); } - EXPECT_FALSE(session_.IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(session_.OneRttKeysAvailable()); CryptoHandshakeMessage message; session_.GetMutableCryptoStream()->OnHandshakeMessage(message); - EXPECT_TRUE(session_.IsCryptoHandshakeConfirmed()); + EXPECT_TRUE(session_.OneRttKeysAvailable()); } TEST_P(QuicSpdySessionTestServer, IsClosedStreamDefault) {
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc index 11a3268..41f8f76 100644 --- a/quic/core/quic_session.cc +++ b/quic/core/quic_session.cc
@@ -985,7 +985,7 @@ return GetCryptoStream()->encryption_established(); } -bool QuicSession::IsCryptoHandshakeConfirmed() const { +bool QuicSession::OneRttKeysAvailable() const { if (GetCryptoStream() == nullptr) { return false; }
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h index 9a252c9..9762dec 100644 --- a/quic/core/quic_session.h +++ b/quic/core/quic_session.h
@@ -245,9 +245,8 @@ // hasn't confirmed the handshake yet. virtual bool IsEncryptionEstablished() const; - // For a client, returns true if the server has confirmed our handshake. For - // a server, returns true if a full, valid client hello has been received. - bool IsCryptoHandshakeConfirmed() const; + // Returns true if 1RTT keys are available. + bool OneRttKeysAvailable() const; // Called by the QuicCryptoStream when a new QuicConfig has been negotiated. virtual void OnConfigNegotiated();
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc index 01b180d..042a671 100644 --- a/quic/core/quic_session_test.cc +++ b/quic/core/quic_session_test.cc
@@ -567,11 +567,11 @@ session_.OnWriteBlocked(); } -TEST_P(QuicSessionTestServer, IsCryptoHandshakeConfirmed) { - EXPECT_FALSE(session_.IsCryptoHandshakeConfirmed()); +TEST_P(QuicSessionTestServer, OneRttKeysAvailable) { + EXPECT_FALSE(session_.OneRttKeysAvailable()); CryptoHandshakeMessage message; session_.GetMutableCryptoStream()->OnHandshakeMessage(message); - EXPECT_TRUE(session_.IsCryptoHandshakeConfirmed()); + EXPECT_TRUE(session_.OneRttKeysAvailable()); } TEST_P(QuicSessionTestServer, IsClosedStreamDefault) { @@ -2343,7 +2343,7 @@ TEST_P(QuicSessionTestServer, SendMessage) { // Cannot send message when encryption is not established. - EXPECT_FALSE(session_.IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(session_.OneRttKeysAvailable()); quic::QuicMemSliceStorage storage(nullptr, 0, nullptr, 0); EXPECT_EQ(MessageResult(MESSAGE_STATUS_ENCRYPTION_NOT_ESTABLISHED, 0), session_.SendMessage( @@ -2353,7 +2353,7 @@ // Finish handshake. CryptoHandshakeMessage handshake_message; session_.GetMutableCryptoStream()->OnHandshakeMessage(handshake_message); - EXPECT_TRUE(session_.IsCryptoHandshakeConfirmed()); + EXPECT_TRUE(session_.OneRttKeysAvailable()); quiche::QuicheStringPiece message; EXPECT_CALL(*connection_, SendMessage(1, _, false))
diff --git a/quic/qbone/qbone_session_test.cc b/quic/qbone/qbone_session_test.cc index 0497ace..5b49aba 100644 --- a/quic/qbone/qbone_session_test.cc +++ b/quic/qbone/qbone_session_test.cc
@@ -375,8 +375,8 @@ // Test handshake establishment and sending/receiving of data for two // directions. void TestStreamConnection(bool use_messages) { - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); ASSERT_TRUE(server_peer_->IsEncryptionEstablished()); ASSERT_TRUE(client_peer_->IsEncryptionEstablished()); @@ -466,10 +466,10 @@ // Test that client and server are not connected after handshake failure. void TestDisconnectAfterFailedHandshake() { EXPECT_FALSE(client_peer_->IsEncryptionEstablished()); - EXPECT_FALSE(client_peer_->IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(client_peer_->OneRttKeysAvailable()); EXPECT_FALSE(server_peer_->IsEncryptionEstablished()); - EXPECT_FALSE(server_peer_->IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(server_peer_->OneRttKeysAvailable()); } protected:
diff --git a/quic/quartc/quartc_session.cc b/quic/quartc/quartc_session.cc index abdb4e6..37de980 100644 --- a/quic/quartc/quartc_session.cc +++ b/quic/quartc/quartc_session.cc
@@ -167,7 +167,7 @@ // On the server, handshake confirmed is the first time when you can start // writing packets. DCHECK(IsEncryptionEstablished()); - DCHECK(IsCryptoHandshakeConfirmed()); + DCHECK(OneRttKeysAvailable()); DCHECK(session_delegate_); session_delegate_->OnConnectionWritable(); @@ -194,7 +194,7 @@ // On the server, handshake confirmed is the first time when you can start // writing packets. DCHECK(IsEncryptionEstablished()); - DCHECK(IsCryptoHandshakeConfirmed()); + DCHECK(OneRttKeysAvailable()); DCHECK(session_delegate_); session_delegate_->OnConnectionWritable();
diff --git a/quic/quartc/quartc_session_test.cc b/quic/quartc/quartc_session_test.cc index 920dfd9..b08ccb4 100644 --- a/quic/quartc/quartc_session_test.cc +++ b/quic/quartc/quartc_session_test.cc
@@ -124,16 +124,16 @@ void AwaitHandshake() { simulator_.RunUntil([this] { - return client_peer_->IsCryptoHandshakeConfirmed() && - server_peer_->IsCryptoHandshakeConfirmed(); + return client_peer_->OneRttKeysAvailable() && + server_peer_->OneRttKeysAvailable(); }); } // Test handshake establishment and sending/receiving of data for two // directions. void TestSendReceiveStreams() { - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); ASSERT_TRUE(server_peer_->IsEncryptionEstablished()); ASSERT_TRUE(client_peer_->IsEncryptionEstablished()); @@ -310,10 +310,10 @@ EXPECT_TRUE(!server_session_delegate_->connected()); EXPECT_FALSE(client_peer_->IsEncryptionEstablished()); - EXPECT_FALSE(client_peer_->IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(client_peer_->OneRttKeysAvailable()); EXPECT_FALSE(server_peer_->IsEncryptionEstablished()); - EXPECT_FALSE(server_peer_->IsCryptoHandshakeConfirmed()); + EXPECT_FALSE(server_peer_->OneRttKeysAvailable()); } protected: @@ -437,8 +437,8 @@ TEST_F(QuartcSessionTest, CancelQuartcStream) { CreateClientAndServerSessions(QuartcSessionConfig()); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); QuartcStream* stream = client_peer_->CreateOutgoingBidirectionalStream(); ASSERT_NE(nullptr, stream); @@ -459,8 +459,8 @@ TEST_F(QuartcSessionTest, WriterGivesPacketNumberToTransport) { CreateClientAndServerSessions(QuartcSessionConfig()); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); QuartcStream* stream = client_peer_->CreateOutgoingBidirectionalStream(); stream->SetDelegate(client_stream_delegate_.get()); @@ -478,8 +478,8 @@ TEST_F(QuartcSessionTest, CloseConnection) { CreateClientAndServerSessions(QuartcSessionConfig()); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); client_peer_->CloseConnection("Connection closed by client"); EXPECT_FALSE(client_session_delegate_->connected()); @@ -490,8 +490,8 @@ TEST_F(QuartcSessionTest, StreamRetransmissionEnabled) { CreateClientAndServerSessions(QuartcSessionConfig()); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); QuartcStream* stream = client_peer_->CreateOutgoingBidirectionalStream(); QuicStreamId stream_id = stream->id(); @@ -521,8 +521,8 @@ client_peer_->connection()->set_fill_up_link_during_probing(false); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); // The client sends an ACK for the crypto handshake next. This must be // flushed before we set the filter to drop the next packet, in order to @@ -578,8 +578,8 @@ server_peer_->connection()->set_fill_up_link_during_probing(false); AwaitHandshake(); - ASSERT_TRUE(client_peer_->IsCryptoHandshakeConfirmed()); - ASSERT_TRUE(server_peer_->IsCryptoHandshakeConfirmed()); + ASSERT_TRUE(client_peer_->OneRttKeysAvailable()); + ASSERT_TRUE(server_peer_->OneRttKeysAvailable()); // The client sends an ACK for the crypto handshake next. This must be // flushed before we set the filter to drop the next packet, in order to
diff --git a/quic/test_tools/server_thread.cc b/quic/test_tools/server_thread.cc index ca15913..da412dd 100644 --- a/quic/test_tools/server_thread.cc +++ b/quic/test_tools/server_thread.cc
@@ -100,7 +100,7 @@ return; } QuicSession* session = dispatcher->session_map().begin()->second.get(); - if (session->IsCryptoHandshakeConfirmed()) { + if (session->OneRttKeysAvailable()) { confirmed_.Notify(); } }
diff --git a/quic/tools/quic_client_base.cc b/quic/tools/quic_client_base.cc index b291463..798ed5f 100644 --- a/quic/tools/quic_client_base.cc +++ b/quic/tools/quic_client_base.cc
@@ -227,7 +227,7 @@ bool QuicClientBase::WaitForCryptoHandshakeConfirmed() { DCHECK(connected()); - while (connected() && !session_->IsCryptoHandshakeConfirmed()) { + while (connected() && !session_->OneRttKeysAvailable()) { WaitForEvents(); }
diff --git a/quic/tools/quic_client_interop_test_bin.cc b/quic/tools/quic_client_interop_test_bin.cc index bea0127..b11065f 100644 --- a/quic/tools/quic_client_interop_test_bin.cc +++ b/quic/tools/quic_client_interop_test_bin.cc
@@ -88,7 +88,7 @@ QUIC_LOG(ERROR) << "Failed to reinitialize client"; return; } - if (!client->Connect() || !client->session()->IsCryptoHandshakeConfirmed()) { + if (!client->Connect() || !client->session()->OneRttKeysAvailable()) { return; } if (static_cast<QuicCryptoClientStream*>( @@ -142,7 +142,7 @@ features_without_version_negotiation.end()); return features; } - if (!client->session()->IsCryptoHandshakeConfirmed()) { + if (!client->session()->OneRttKeysAvailable()) { return features; } features.insert(Feature::kHandshake);