Use 1-arg ParsedQuicVersion constructor in third_party/quic/...
PiperOrigin-RevId: 839966053
diff --git a/quiche/quic/core/quic_versions.cc b/quiche/quic/core/quic_versions.cc
index d473247..85c205d 100644
--- a/quiche/quic/core/quic_versions.cc
+++ b/quiche/quic/core/quic_versions.cc
@@ -293,7 +293,7 @@
if (!ParsedQuicVersionIsValid(PROTOCOL_QUIC_CRYPTO, transport_version)) {
return UnsupportedQuicVersion();
}
- ParsedQuicVersion version(PROTOCOL_QUIC_CRYPTO, transport_version);
+ ParsedQuicVersion version(transport_version);
if (std::find(supported_versions.begin(), supported_versions.end(),
version) != supported_versions.end()) {
return version;
diff --git a/quiche/quic/core/quic_versions.h b/quiche/quic/core/quic_versions.h
index 2ecd462..db0c265 100644
--- a/quiche/quic/core/quic_versions.h
+++ b/quiche/quic/core/quic_versions.h
@@ -268,28 +268,27 @@
}
static constexpr ParsedQuicVersion RFCv2() {
- return ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_RFC_V2);
+ return ParsedQuicVersion(QUIC_VERSION_IETF_RFC_V2);
}
static constexpr ParsedQuicVersion RFCv1() {
- return ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_RFC_V1);
+ return ParsedQuicVersion(QUIC_VERSION_IETF_RFC_V1);
}
static constexpr ParsedQuicVersion Draft29() {
- return ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_29);
+ return ParsedQuicVersion(QUIC_VERSION_IETF_DRAFT_29);
}
static constexpr ParsedQuicVersion Q046() {
- return ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46);
+ return ParsedQuicVersion(QUIC_VERSION_46);
}
static constexpr ParsedQuicVersion Unsupported() {
- return ParsedQuicVersion(PROTOCOL_UNSUPPORTED, QUIC_VERSION_UNSUPPORTED);
+ return ParsedQuicVersion(QUIC_VERSION_UNSUPPORTED);
}
static constexpr ParsedQuicVersion ReservedForNegotiation() {
- return ParsedQuicVersion(PROTOCOL_TLS1_3,
- QUIC_VERSION_RESERVED_FOR_NEGOTIATION);
+ return ParsedQuicVersion(QUIC_VERSION_RESERVED_FOR_NEGOTIATION);
}
// Returns whether our codebase understands this version. This should only be
diff --git a/quiche/quic/core/quic_versions_test.cc b/quiche/quic/core/quic_versions_test.cc
index 7215af0..ba0c34e 100644
--- a/quiche/quic/core/quic_versions_test.cc
+++ b/quiche/quic/core/quic_versions_test.cc
@@ -427,8 +427,7 @@
SCOPED_TRACE(index);
if (ParsedQuicVersionIsValid(handshake_protocol, transport_version)) {
ParsedQuicVersion version = SupportedVersions()[index];
- EXPECT_EQ(version,
- ParsedQuicVersion(handshake_protocol, transport_version));
+ EXPECT_EQ(version, ParsedQuicVersion(transport_version));
index++;
}
}
diff --git a/quiche/quic/test_tools/crypto_test_utils.cc b/quiche/quic/test_tools/crypto_test_utils.cc
index 1ec6102..0338daa 100644
--- a/quiche/quic/test_tools/crypto_test_utils.cc
+++ b/quiche/quic/test_tools/crypto_test_utils.cc
@@ -833,6 +833,7 @@
CryptoHandshakeMessage GenerateDefaultInchoateCHLO(
const QuicClock* clock, QuicTransportVersion version,
QuicCryptoServerConfig* crypto_config) {
+ QUICHE_DCHECK_EQ(version, QUIC_VERSION_46);
// clang-format off
return CreateCHLO(
{{"PDMD", "X509"},
@@ -842,7 +843,7 @@
{"NONC", GenerateClientNonceHex(clock, crypto_config).c_str()},
{"VER\0", QuicVersionLabelToString(
CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version))).c_str()}},
+ ParsedQuicVersion(version))).c_str()}},
kClientHelloMinimumSize);
// clang-format on
}
@@ -882,11 +883,11 @@
quiche::QuicheReferenceCountedPointer<QuicSignedServerConfig> signed_config,
QuicCompressedCertsCache* compressed_certs_cache,
CryptoHandshakeMessage* out) {
+ QUICHE_DCHECK_EQ(transport_version, QUIC_VERSION_46);
// Pass a inchoate CHLO.
- FullChloGenerator generator(
- crypto_config, server_addr, client_addr, clock,
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, transport_version), signed_config,
- compressed_certs_cache, out);
+ FullChloGenerator generator(crypto_config, server_addr, client_addr, clock,
+ ParsedQuicVersion(transport_version),
+ signed_config, compressed_certs_cache, out);
crypto_config->ValidateClientHello(
inchoate_chlo, client_addr, server_addr, transport_version, clock,
signed_config, generator.GetValidateClientHelloCallback());
diff --git a/quiche/quic/test_tools/crypto_test_utils_test.cc b/quiche/quic/test_tools/crypto_test_utils_test.cc
index 862fd75..eb3541b 100644
--- a/quiche/quic/test_tools/crypto_test_utils_test.cc
+++ b/quiche/quic/test_tools/crypto_test_utils_test.cc
@@ -178,9 +178,8 @@
{"COPT", "SREJ"},
{"PUBS", pub_hex},
{"NONC", nonce_hex},
- {"VER\0",
- QuicVersionLabelToString(CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, transport_version)))}},
+ {"VER\0", QuicVersionLabelToString(CreateQuicVersionLabel(
+ ParsedQuicVersion(transport_version)))}},
kClientHelloMinimumSize);
crypto_test_utils::GenerateFullCHLO(inchoate_chlo, &crypto_config,
@@ -188,20 +187,18 @@
transport_version, &clock, signed_config,
&compressed_certs_cache, &full_chlo);
// Verify that full_chlo can pass crypto_config's verification.
- ShloVerifier shlo_verifier(
- &crypto_config, server_addr, client_addr, &clock, signed_config,
- &compressed_certs_cache,
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, transport_version));
+ ShloVerifier shlo_verifier(&crypto_config, server_addr, client_addr, &clock,
+ signed_config, &compressed_certs_cache,
+ ParsedQuicVersion(transport_version));
crypto_config.ValidateClientHello(
full_chlo, client_addr, server_addr, transport_version, &clock,
signed_config, shlo_verifier.GetValidateClientHelloCallback());
ASSERT_EQ(shlo_verifier.chlo_accepted(),
!GetQuicReloadableFlag(quic_require_handshake_confirmation));
if (!shlo_verifier.chlo_accepted()) {
- ShloVerifier shlo_verifier2(
- &crypto_config, server_addr, client_addr, &clock, signed_config,
- &compressed_certs_cache,
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, transport_version));
+ ShloVerifier shlo_verifier2(&crypto_config, server_addr, client_addr,
+ &clock, signed_config, &compressed_certs_cache,
+ ParsedQuicVersion(transport_version));
full_chlo.SetStringPiece(
kServerNonceTag,
"#" + absl::BytesToHexString(shlo_verifier.server_nonce()));
diff --git a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
index 9c57be7..1c9577d 100644
--- a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
+++ b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
@@ -45,7 +45,6 @@
};
return ParsedQuicVersion(
- PROTOCOL_QUIC_CRYPTO,
transport_versions[provider->ConsumeIntegralInRange<uint8_t>(
0, ABSL_ARRAYSIZE(transport_versions) - 1)]);
}
