Update QUICHE from 81314ecbd to c2ddf95dc

bazel/external/quiche.BUILD

@@ -2003,6 +2003,7 @@ envoy_cc_library(
         "quiche/quic/core/crypto/curve25519_key_exchange.cc",
         "quiche/quic/core/crypto/key_exchange.cc",
         "quiche/quic/core/crypto/p256_key_exchange.cc",
+        "quiche/quic/core/crypto/quic_client_session_cache.cc",
         "quiche/quic/core/crypto/quic_compressed_certs_cache.cc",
         "quiche/quic/core/crypto/quic_crypto_client_config.cc",
         "quiche/quic/core/crypto/quic_crypto_server_config.cc",
@@ -2023,6 +2024,7 @@ envoy_cc_library(
         "quiche/quic/core/crypto/key_exchange.h",
         "quiche/quic/core/crypto/p256_key_exchange.h",
         "quiche/quic/core/crypto/proof_verifier.h",
+        "quiche/quic/core/crypto/quic_client_session_cache.h",
         "quiche/quic/core/crypto/quic_compressed_certs_cache.h",
         "quiche/quic/core/crypto/quic_crypto_client_config.h",
         "quiche/quic/core/crypto/quic_crypto_server_config.h",

bazel/repository_locations.bzl

@@ -838,12 +838,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "QUICHE",
         project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
         project_url = "https://github.com/google/quiche",
-        version = "81314ecbd8cfd3c8399fcd1c1e7ca557b41d18de",
-        sha256 = "61e28bf91daba19f65af53b19fbefd5876b3365835e7c0091ccf0c91dba72ba6",
+        version = "c2ddf95dc2380e1d7cd5aa8fe9f61b4e01b23e6b",
+        sha256 = "435dc3c3858d8328c48fb633bc46431aa5aea2a29e0b5f125f743b0b5b5c1513",
         urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
         strip_prefix = "quiche-{version}",
         use_category = ["dataplane_core"],
-        release_date = "2021-11-17",
+        release_date = "2021-11-22",
         cpe = "N/A",
     ),
     com_googlesource_googleurl = dict(

source/common/quic/BUILD

@@ -124,17 +124,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "envoy_quic_session_cache_lib",
-    srcs = ["envoy_quic_session_cache.cc"],
-    hdrs = ["envoy_quic_session_cache.h"],
-    external_deps = ["quiche_quic_platform"],
-    tags = ["nofips"],
-    deps = [
-        "@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib",
-    ],
-)
-
 envoy_cc_library(
     name = "spdy_server_push_utils_for_envoy_lib",
     srcs = ["spdy_server_push_utils_for_envoy.cc"],
@@ -173,7 +162,6 @@ envoy_cc_library(
         ":envoy_quic_connection_helper_lib",
         ":envoy_quic_proof_verifier_lib",
         ":envoy_quic_server_session_lib",
-        ":envoy_quic_session_cache_lib",
         ":envoy_quic_utils_lib",
         "//envoy/http:codec_interface",
         "//envoy/registry",

source/common/quic/client_connection_factory_impl.cc

@@ -1,8 +1,9 @@
 #include "source/common/quic/client_connection_factory_impl.h"
 
-#include "source/common/quic/envoy_quic_session_cache.h"
 #include "source/common/quic/quic_transport_socket_factory.h"
 
+#include "quiche/quic/core/crypto/quic_client_session_cache.h"
+
 namespace Envoy {
 namespace Quic {
 
@@ -34,7 +35,7 @@ std::shared_ptr<quic::QuicCryptoClientConfig> PersistentQuicInfoImpl::cryptoConf
     client_context_ = context;
     client_config_ = std::make_shared<quic::QuicCryptoClientConfig>(
         std::make_unique<EnvoyQuicProofVerifier>(getContext(transport_socket_factory_)),
-        std::make_unique<EnvoyQuicSessionCache>((time_source_)));
+        std::make_unique<quic::QuicClientSessionCache>());
   }
   // Return the latest client config.
   return client_config_;

source/common/quic/platform/quiche_flags_impl.cc

@@ -37,6 +37,8 @@ absl::flat_hash_map<absl::string_view, Flag*> makeFlagMap() {
   FLAGS_quic_reloadable_flag_quic_disable_version_draft_29->setValue(true);
   // This flag fixes a QUICHE issue which may crash Envoy during connection close.
   FLAGS_quic_reloadable_flag_quic_single_ack_in_packet2->setValue(true);
+  // Correctly use the new QUICHE session cache.
+  FLAGS_quic_reloadable_flag_quic_tls_use_token_in_session_cache->setValue(true);
 
 #define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag);
 #include "quiche/quic/core/quic_protocol_flags_list.h"

test/common/quic/BUILD

@@ -80,16 +80,6 @@ envoy_cc_test(
     ],
 )
 
-envoy_cc_test(
-    name = "envoy_quic_session_cache_test",
-    srcs = ["envoy_quic_session_cache_test.cc"],
-    external_deps = ["quiche_quic_platform"],
-    tags = ["nofips"],
-    deps = [
-        "//source/common/quic:envoy_quic_session_cache_lib",
-    ],
-)
-
 envoy_cc_test(
     name = "envoy_quic_proof_verifier_test",
     srcs = ["envoy_quic_proof_verifier_test.cc"],