Remove an unused parameter from quic::SerializeTransportParameters. PiperOrigin-RevId: 445288812
diff --git a/quiche/quic/core/crypto/transport_parameters.cc b/quiche/quic/core/crypto/transport_parameters.cc index ca2adc8..635d159 100644 --- a/quiche/quic/core/crypto/transport_parameters.cc +++ b/quiche/quic/core/crypto/transport_parameters.cc
@@ -660,8 +660,7 @@ TransportParameters::~TransportParameters() = default; -bool SerializeTransportParameters(ParsedQuicVersion /*version*/, - const TransportParameters& in, +bool SerializeTransportParameters(const TransportParameters& in, std::vector<uint8_t>* out) { std::string error_details; if (!in.AreValid(&error_details)) {
diff --git a/quiche/quic/core/crypto/transport_parameters.h b/quiche/quic/core/crypto/transport_parameters.h index f55f65d..e1f349b 100644 --- a/quiche/quic/core/crypto/transport_parameters.h +++ b/quiche/quic/core/crypto/transport_parameters.h
@@ -273,8 +273,7 @@ // TLS extension. The serialized bytes are written to |*out|. Returns if the // parameters are valid and serialization succeeded. QUIC_EXPORT_PRIVATE bool SerializeTransportParameters( - ParsedQuicVersion version, const TransportParameters& in, - std::vector<uint8_t>* out); + const TransportParameters& in, std::vector<uint8_t>* out); // Parses bytes from the quic_transport_parameters TLS extension and writes the // parsed parameters into |*out|. Input is read from |in| for |in_len| bytes.
diff --git a/quiche/quic/core/crypto/transport_parameters_test.cc b/quiche/quic/core/crypto/transport_parameters_test.cc index fe9a2ce..b8793ec 100644 --- a/quiche/quic/core/crypto/transport_parameters_test.cc +++ b/quiche/quic/core/crypto/transport_parameters_test.cc
@@ -323,7 +323,7 @@ orig_params.custom_parameters[kCustomParameter2] = kCustomParameter2Value; std::vector<uint8_t> serialized; - ASSERT_TRUE(SerializeTransportParameters(version_, orig_params, &serialized)); + ASSERT_TRUE(SerializeTransportParameters(orig_params, &serialized)); TransportParameters new_params; std::string error_details; @@ -369,7 +369,7 @@ orig_params.google_connection_options = CreateFakeGoogleConnectionOptions(); std::vector<uint8_t> serialized; - ASSERT_TRUE(SerializeTransportParameters(version_, orig_params, &serialized)); + ASSERT_TRUE(SerializeTransportParameters(orig_params, &serialized)); TransportParameters new_params; std::string error_details; @@ -486,7 +486,7 @@ std::vector<uint8_t> out; bool ok = true; EXPECT_QUIC_BUG( - ok = SerializeTransportParameters(version_, orig_params, &out), + ok = SerializeTransportParameters(orig_params, &out), "Not serializing invalid transport parameters: Client cannot send " "stateless reset token"); EXPECT_FALSE(ok); @@ -970,7 +970,7 @@ orig_params.custom_parameters[kCustomParameter1] = custom_value; std::vector<uint8_t> serialized; - ASSERT_TRUE(SerializeTransportParameters(version_, orig_params, &serialized)); + ASSERT_TRUE(SerializeTransportParameters(orig_params, &serialized)); TransportParameters new_params; std::string error_details; @@ -1013,15 +1013,13 @@ orig_params.custom_parameters[kCustomParameter2] = kCustomParameter2Value; std::vector<uint8_t> first_serialized; - ASSERT_TRUE( - SerializeTransportParameters(version_, orig_params, &first_serialized)); + ASSERT_TRUE(SerializeTransportParameters(orig_params, &first_serialized)); // Test that a subsequent serialization is different from the first. // Run in a loop to avoid a failure in the unlikely event that randomization // produces the same result multiple times. for (int i = 0; i < 1000; i++) { std::vector<uint8_t> serialized; - ASSERT_TRUE( - SerializeTransportParameters(version_, orig_params, &serialized)); + ASSERT_TRUE(SerializeTransportParameters(orig_params, &serialized)); if (serialized != first_serialized) { return; }
diff --git a/quiche/quic/core/tls_client_handshaker.cc b/quiche/quic/core/tls_client_handshaker.cc index fccdb20..dbe7234 100644 --- a/quiche/quic/core/tls_client_handshaker.cc +++ b/quiche/quic/core/tls_client_handshaker.cc
@@ -236,8 +236,7 @@ session()->connection()->OnTransportParametersSent(params); std::vector<uint8_t> param_bytes; - return SerializeTransportParameters(session()->connection()->version(), - params, ¶m_bytes) && + return SerializeTransportParameters(params, ¶m_bytes) && SSL_set_quic_transport_params(ssl(), param_bytes.data(), param_bytes.size()) == 1; }
diff --git a/quiche/quic/core/tls_server_handshaker.cc b/quiche/quic/core/tls_server_handshaker.cc index 7a17acc..3d9be2a 100644 --- a/quiche/quic/core/tls_server_handshaker.cc +++ b/quiche/quic/core/tls_server_handshaker.cc
@@ -528,8 +528,7 @@ { // Ensure |server_params_bytes| is not accessed out of the scope. std::vector<uint8_t> server_params_bytes; - if (!SerializeTransportParameters(session()->connection()->version(), - server_params, &server_params_bytes) || + if (!SerializeTransportParameters(server_params, &server_params_bytes) || SSL_set_quic_transport_params(ssl(), server_params_bytes.data(), server_params_bytes.size()) != 1) { return result;