From 8bfd2d1d66892386cc76da5b6a3e333e1e8575f9 Mon Sep 17 00:00:00 2001 From: Joseph Beshay Date: Thu, 9 May 2024 18:08:14 -0700 Subject: [PATCH] Remove temporary setting for rejecting quic key updates Summary: This setting is no longer needed. Reviewed By: mjoras Differential Revision: D57112554 fbshipit-source-id: 4720dd864f24ac21a775419522254195c5ea215f --- quic/api/QuicTransportFunctions.cpp | 4 ---- quic/state/TransportSettings.h | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/quic/api/QuicTransportFunctions.cpp b/quic/api/QuicTransportFunctions.cpp index 78f0a2bf6..930e7bd57 100644 --- a/quic/api/QuicTransportFunctions.cpp +++ b/quic/api/QuicTransportFunctions.cpp @@ -1946,10 +1946,6 @@ void updateOneRttWriteCipher( void maybeHandleIncomingKeyUpdate(QuicConnectionStateBase& conn) { if (conn.readCodec->getCurrentOneRttReadPhase() != conn.oneRttWritePhase) { // Peer has initiated a key update. - if (conn.transportSettings.rejectIncomingKeyUpdates) { - throw QuicTransportException( - "key update attempt rejected", TransportErrorCode::CRYPTO_ERROR); - } updateOneRttWriteCipher( conn, conn.handshakeLayer->getNextOneRttWriteCipher(), diff --git a/quic/state/TransportSettings.h b/quic/state/TransportSettings.h index 533993ed1..171478139 100644 --- a/quic/state/TransportSettings.h +++ b/quic/state/TransportSettings.h @@ -361,10 +361,7 @@ struct TransportSettings { kFirstKeyUpdatePacketCount}; // How many packets to send before initiating periodic key updates uint64_t keyUpdatePacketCountInterval{kDefaultKeyUpdatePacketCountInterval}; - // Whether to terminate the connection when a peer initiates a key update. - // TODO: Remove this. This is a temporary measure to gradually roll out key - // update support. - bool rejectIncomingKeyUpdates{false}; + // Temporary flag to test new stream blocked condition. bool useNewStreamBlockedCondition{false}; bool scheduleTimerForExcessWrites{false};