commit 416168464c9f3217d556208b67d510580f87da80
author dschinazi <dschinazi@google.com> Tue Jan 21 15:46:11 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 21 15:46:46 2020 -0800
tree bcecc8e184305727c86ec81b17dcd410a63eaa30
parent f579b5e51aaf2224e9c80ff1fb4606492bd0cba4

Remove QUIC version Q099

(I took over cl/285250934 from ianswett@ to load-balance)

This CL deprecates gfe2_reloadable_flag_quic_enable_q099 false, because it is blocked and will never be enabled.

gfe-relnote: n/a (Deprecate blocked flag)
PiperOrigin-RevId: 290839787
Change-Id: I319337542735b8df2d8bf862f0c2624adf01c343

quic/test_tools/crypto_test_utils_test.cc

diff --git a/quic/test_tools/crypto_test_utils_test.cc b/quic/test_tools/crypto_test_utils_test.cc
index 62cafe6..582568c 100644
--- a/quic/test_tools/crypto_test_utils_test.cc
+++ b/quic/test_tools/crypto_test_utils_test.cc
@@ -142,7 +142,17 @@
   std::string pub_hex = "#" + quiche::QuicheTextUtils::HexEncode(
                                   public_value, sizeof(public_value));
 
-  QuicTransportVersion version(AllSupportedTransportVersions().front());
+  // The methods below use a PROTOCOL_QUIC_CRYPTO version so we pick the
+  // first one from the list of supported versions.
+  QuicTransportVersion transport_version = QUIC_VERSION_UNSUPPORTED;
+  for (const ParsedQuicVersion& version : AllSupportedVersions()) {
+    if (version.handshake_protocol == PROTOCOL_QUIC_CRYPTO) {
+      transport_version = version.transport_version;
+      break;
+    }
+  }
+  ASSERT_NE(QUIC_VERSION_UNSUPPORTED, transport_version);
+
   CryptoHandshakeMessage inchoate_chlo = crypto_test_utils::CreateCHLO(
       {{"PDMD", "X509"},
        {"AEAD", "AESG"},
@@ -150,18 +160,19 @@
        {"COPT", "SREJ"},
        {"PUBS", pub_hex},
        {"NONC", nonce_hex},
-       {"VER\0",
-        QuicVersionLabelToString(QuicVersionToQuicVersionLabel(version))}},
+       {"VER\0", QuicVersionLabelToString(
+                     QuicVersionToQuicVersionLabel(transport_version))}},
       kClientHelloMinimumSize);
 
-  crypto_test_utils::GenerateFullCHLO(
-      inchoate_chlo, &crypto_config, server_addr, client_addr, version, &clock,
-      signed_config, &compressed_certs_cache, &full_chlo);
+  crypto_test_utils::GenerateFullCHLO(inchoate_chlo, &crypto_config,
+                                      server_addr, client_addr,
+                                      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);
   crypto_config.ValidateClientHello(
-      full_chlo, client_addr.host(), server_addr, version, &clock,
+      full_chlo, client_addr.host(), server_addr, transport_version, &clock,
       signed_config, shlo_verifier.GetValidateClientHelloCallback());
 }