Use std::unique_ptr in QuicCryptoClientConfig::CachedState::SetProofVerifyDetails PiperOrigin-RevId: 795559358
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config.cc b/quiche/quic/core/crypto/quic_crypto_client_config.cc index 773f92e..0e37e2d 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config.cc +++ b/quiche/quic/core/crypto/quic_crypto_client_config.cc
@@ -5,35 +5,49 @@ #include "quiche/quic/core/crypto/quic_crypto_client_config.h" #include <algorithm> +#include <cstddef> +#include <cstdint> +#include <cstring> #include <memory> #include <string> #include <utility> #include <vector> #include "absl/base/macros.h" +#include "absl/base/nullability.h" #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" +#include "openssl/aead.h" #include "openssl/ssl.h" #include "quiche/quic/core/crypto/cert_compressor.h" -#include "quiche/quic/core/crypto/chacha20_poly1305_encrypter.h" +#include "quiche/quic/core/crypto/client_proof_source.h" #include "quiche/quic/core/crypto/crypto_framer.h" +#include "quiche/quic/core/crypto/crypto_handshake.h" #include "quiche/quic/core/crypto/crypto_protocol.h" #include "quiche/quic/core/crypto/crypto_utils.h" #include "quiche/quic/core/crypto/curve25519_key_exchange.h" #include "quiche/quic/core/crypto/key_exchange.h" #include "quiche/quic/core/crypto/p256_key_exchange.h" #include "quiche/quic/core/crypto/proof_verifier.h" -#include "quiche/quic/core/crypto/quic_encrypter.h" #include "quiche/quic/core/crypto/quic_random.h" #include "quiche/quic/core/crypto/tls_client_connection.h" #include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_constants.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_server_id.h" +#include "quiche/quic/core/quic_tag.h" +#include "quiche/quic/core/quic_time.h" #include "quiche/quic/core/quic_types.h" #include "quiche/quic/core/quic_utils.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/platform/api/quic_bug_tracker.h" #include "quiche/quic/platform/api/quic_client_stats.h" +#include "quiche/quic/platform/api/quic_flags.h" #include "quiche/quic/platform/api/quic_hostname_utils.h" #include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" +#include "quiche/common/platform/api/quiche_reference_counted.h" namespace quic { @@ -307,7 +321,7 @@ return generation_counter_; } -const ProofVerifyDetails* +const ProofVerifyDetails* absl_nullable QuicCryptoClientConfig::CachedState::proof_verify_details() const { return proof_verify_details_.get(); } @@ -323,8 +337,8 @@ } void QuicCryptoClientConfig::CachedState::SetProofVerifyDetails( - ProofVerifyDetails* details) { - proof_verify_details_.reset(details); + std::unique_ptr<ProofVerifyDetails> details) { + proof_verify_details_ = std::move(details); } void QuicCryptoClientConfig::CachedState::InitializeFrom(
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config.h b/quiche/quic/core/crypto/quic_crypto_client_config.h index 6020294..f692089 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config.h +++ b/quiche/quic/core/crypto/quic_crypto_client_config.h
@@ -8,7 +8,9 @@ #include <cstdint> #include <map> #include <memory> +#include <optional> #include <string> +#include <utility> #include <vector> #include "absl/strings/string_view.h" @@ -16,12 +18,15 @@ #include "openssl/ssl.h" #include "quiche/quic/core/crypto/client_proof_source.h" #include "quiche/quic/core/crypto/crypto_handshake.h" -#include "quiche/quic/core/crypto/crypto_protocol.h" #include "quiche/quic/core/crypto/quic_random.h" #include "quiche/quic/core/crypto/transport_parameters.h" -#include "quiche/quic/core/quic_packets.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_error_codes.h" #include "quiche/quic/core/quic_server_id.h" -#include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_versions.h" +#include "quiche/common/platform/api/quiche_export.h" #include "quiche/common/platform/api/quiche_reference_counted.h" namespace quic { @@ -186,8 +191,7 @@ void set_cert_sct(absl::string_view cert_sct); - // SetProofVerifyDetails takes ownership of |details|. - void SetProofVerifyDetails(ProofVerifyDetails* details); + void SetProofVerifyDetails(std::unique_ptr<ProofVerifyDetails> details); // Copy the |server_config_|, |source_address_token_|, |certs_|, // |expiration_time_|, |cert_sct_|, |chlo_hash_| and |server_config_sig_|
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc index 083f217..38e9052 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc +++ b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -4,19 +4,30 @@ #include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include <cstddef> +#include <cstdint> +#include <memory> #include <string> +#include <utility> #include <vector> #include "absl/strings/string_view.h" +#include "openssl/aead.h" +#include "quiche/quic/core/crypto/crypto_handshake.h" +#include "quiche/quic/core/crypto/crypto_protocol.h" #include "quiche/quic/core/crypto/proof_verifier.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_constants.h" +#include "quiche/quic/core/quic_error_codes.h" #include "quiche/quic/core/quic_server_id.h" -#include "quiche/quic/core/quic_types.h" -#include "quiche/quic/core/quic_utils.h" -#include "quiche/quic/platform/api/quic_expect_bug.h" +#include "quiche/quic/core/quic_tag.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/platform/api/quic_test.h" #include "quiche/quic/test_tools/crypto_test_utils.h" #include "quiche/quic/test_tools/mock_random.h" #include "quiche/quic/test_tools/quic_test_utils.h" +#include "quiche/common/platform/api/quiche_reference_counted.h" using testing::StartsWith; @@ -76,10 +87,11 @@ TEST_F(QuicCryptoClientConfigTest, CachedState_SetProofVerifyDetails) { QuicCryptoClientConfig::CachedState state; - EXPECT_TRUE(state.proof_verify_details() == nullptr); - ProofVerifyDetails* details = new TestProofVerifyDetails; - state.SetProofVerifyDetails(details); - EXPECT_EQ(details, state.proof_verify_details()); + EXPECT_EQ(state.proof_verify_details(), nullptr); + std::unique_ptr<ProofVerifyDetails> details(new TestProofVerifyDetails); + const auto* details_ptr = details.get(); + state.SetProofVerifyDetails(std::move(details)); + EXPECT_EQ(details_ptr, state.proof_verify_details()); } TEST_F(QuicCryptoClientConfigTest, CachedState_InitializeFrom) {
diff --git a/quiche/quic/core/quic_crypto_client_handshaker.cc b/quiche/quic/core/quic_crypto_client_handshaker.cc index 9cf4e6a..b4170d9 100644 --- a/quiche/quic/core/quic_crypto_client_handshaker.cc +++ b/quiche/quic/core/quic_crypto_client_handshaker.cc
@@ -4,17 +4,35 @@ #include "quiche/quic/core/quic_crypto_client_handshaker.h" +#include <cstddef> +#include <cstdint> #include <memory> #include <string> #include <utility> #include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "openssl/ssl.h" +#include "quiche/quic/core/crypto/crypto_handshake.h" +#include "quiche/quic/core/crypto/crypto_handshake_message.h" +#include "quiche/quic/core/crypto/crypto_message_parser.h" #include "quiche/quic/core/crypto/crypto_protocol.h" #include "quiche/quic/core/crypto/crypto_utils.h" +#include "quiche/quic/core/crypto/proof_verifier.h" +#include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include "quiche/quic/core/crypto/quic_decrypter.h" +#include "quiche/quic/core/crypto/quic_encrypter.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_crypto_client_stream.h" +#include "quiche/quic/core/quic_crypto_handshaker.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_server_id.h" #include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_tag.h" +#include "quiche/quic/core/quic_time.h" #include "quiche/quic/core/quic_types.h" +#include "quiche/quic/platform/api/quic_bug_tracker.h" #include "quiche/quic/platform/api/quic_client_stats.h" -#include "quiche/quic/platform/api/quic_flags.h" #include "quiche/quic/platform/api/quic_logging.h" #include "quiche/common/platform/api/quiche_logging.h" @@ -532,7 +550,7 @@ next_state_ = STATE_VERIFY_PROOF; } else { SetCachedProofValid(cached); - cached->SetProofVerifyDetails(verify_details_.release()); + cached->SetProofVerifyDetails(std::move(verify_details_)); if (!one_rtt_keys_available()) { next_state_ = STATE_SEND_CHLO; } else {