quiche: update QUICHE to commit 5dd7a030209f9a6b5043bebd8ac3ee54f18d1d08

bazel/external/quiche.BUILD

@@ -92,9 +92,9 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http2_core_write_scheduler_lib",
+        ":quiche_common_platform",
         ":spdy_core_intrusive_list_lib",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -105,8 +105,8 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http2_core_write_scheduler_lib",
+        ":quiche_common_platform",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -125,13 +125,10 @@ envoy_cc_library(
     name = "http2_platform",
     hdrs = [
         "quiche/http2/platform/api/http2_bug_tracker.h",
-        "quiche/http2/platform/api/http2_containers.h",
-        "quiche/http2/platform/api/http2_estimate_memory_usage.h",
         "quiche/http2/platform/api/http2_flag_utils.h",
         "quiche/http2/platform/api/http2_flags.h",
         "quiche/http2/platform/api/http2_logging.h",
         "quiche/http2/platform/api/http2_macros.h",
-        "quiche/http2/platform/api/http2_string_utils.h",
         # TODO: uncomment the following files as implementations are added.
         # "quiche/http2/platform/api/http2_test_helpers.h",
     ],
@@ -686,6 +683,7 @@ envoy_cc_library(
         ":http2_hpack_decoder_hpack_whole_entry_listener_lib",
         ":http2_hpack_hpack_constants_lib",
         ":http2_platform",
+        ":quiche_common_text_utils_lib",
     ],
 )
 
@@ -773,28 +771,15 @@ envoy_cc_library(
     deps = [":http2_platform"],
 )
 
-envoy_cc_library(
-    name = "spdy_platform",
-    hdrs = [
-        "quiche/spdy/platform/api/spdy_containers.h",
-        "quiche/spdy/platform/api/spdy_estimate_memory_usage.h",
-        "quiche/spdy/platform/api/spdy_string_utils.h",
-    ],
-    repository = "@envoy",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":quiche_common_lib",
-        "@envoy//source/common/quic/platform:spdy_platform_impl_lib",
-    ],
-)
-
 envoy_cc_library(
     name = "spdy_simple_arena_lib",
     srcs = ["quiche/spdy/core/spdy_simple_arena.cc"],
     hdrs = ["quiche/spdy/core/spdy_simple_arena.h"],
     repository = "@envoy",
     visibility = ["//visibility:public"],
-    deps = [":spdy_platform"],
+    deps = [
+        ":quiche_common_platform",
+    ],
 )
 
 envoy_cc_library(
@@ -804,7 +789,7 @@ envoy_cc_library(
     copts = quiche_copts,
     repository = "@envoy",
     visibility = ["//visibility:public"],
-    deps = [":spdy_platform"],
+    deps = [":quiche_common_platform"],
 )
 
 envoy_cc_library(
@@ -821,14 +806,14 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http2_platform",
+        ":quiche_common_platform",
         ":spdy_core_alt_svc_wire_format_lib",
         ":spdy_core_frame_reader_lib",
         ":spdy_core_header_block_lib",
         ":spdy_core_headers_handler_interface_lib",
         ":spdy_core_hpack_hpack_lib",
         ":spdy_core_protocol_lib",
         ":spdy_core_zero_copy_output_buffer_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -839,8 +824,8 @@ envoy_cc_library(
     copts = quiche_copts,
     repository = "@envoy",
     deps = [
+        ":quiche_common_platform",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -852,8 +837,9 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
+        ":quiche_common_lib",
+        ":quiche_common_platform",
         ":spdy_core_header_storage_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -865,7 +851,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         "spdy_simple_arena_lib",
-        ":spdy_platform",
+        ":quiche_common_platform",
     ],
 )
 
@@ -875,7 +861,7 @@ envoy_cc_library(
     copts = quiche_copts,
     repository = "@envoy",
     visibility = ["//visibility:public"],
-    deps = [":spdy_platform"],
+    deps = [":quiche_common_platform"],
 )
 
 envoy_cc_library(
@@ -892,13 +878,13 @@ envoy_cc_library(
         ":http2_decoder_frame_decoder_listener_lib",
         ":http2_platform",
         ":http2_structures_lib",
+        ":quiche_common_platform",
         ":spdy_core_alt_svc_wire_format_lib",
         ":spdy_core_header_block_lib",
         ":spdy_core_headers_handler_interface_lib",
         ":spdy_core_hpack_hpack_decoder_adapter_lib",
         ":spdy_core_hpack_hpack_lib",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -930,8 +916,8 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http2_hpack_huffman_hpack_huffman_encoder_lib",
+        ":quiche_common_platform",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -948,10 +934,10 @@ envoy_cc_library(
         ":http2_hpack_decoder_hpack_decoder_listener_lib",
         ":http2_hpack_decoder_hpack_decoder_tables_lib",
         ":http2_hpack_hpack_constants_lib",
+        ":quiche_common_platform",
         ":spdy_core_header_block_lib",
         ":spdy_core_headers_handler_interface_lib",
         ":spdy_core_hpack_hpack_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -966,9 +952,9 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
+        ":quiche_common_platform",
         ":spdy_core_alt_svc_wire_format_lib",
         ":spdy_core_header_block_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -977,8 +963,8 @@ envoy_cc_library(
     hdrs = ["quiche/spdy/core/write_scheduler.h"],
     repository = "@envoy",
     deps = [
+        ":quiche_common_platform",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -989,11 +975,11 @@ envoy_cc_test_library(
     copts = quiche_copts,
     repository = "@envoy",
     deps = [
+        ":quiche_common_platform",
         ":quiche_common_test_tools_test_utils_lib",
         ":spdy_core_header_block_lib",
         ":spdy_core_headers_handler_interface_lib",
         ":spdy_core_protocol_lib",
-        ":spdy_platform",
     ],
 )
 
@@ -1007,12 +993,10 @@ envoy_cc_library(
 envoy_cc_library(
     name = "quic_platform",
     srcs = [
-        "quiche/quic/platform/api/quic_file_utils.cc",
         "quiche/quic/platform/api/quic_hostname_utils.cc",
         "quiche/quic/platform/api/quic_mutex.cc",
     ],
     hdrs = [
-        "quiche/quic/platform/api/quic_file_utils.h",
         "quiche/quic/platform/api/quic_hostname_utils.h",
         "quiche/quic/platform/api/quic_mutex.h",
     ],
@@ -1033,13 +1017,11 @@ envoy_cc_library(
         "quiche/quic/platform/api/quic_client_stats.h",
         "quiche/quic/platform/api/quic_containers.h",
         "quiche/quic/platform/api/quic_error_code_wrappers.h",
-        "quiche/quic/platform/api/quic_estimate_memory_usage.h",
         "quiche/quic/platform/api/quic_exported_stats.h",
         "quiche/quic/platform/api/quic_flag_utils.h",
         "quiche/quic/platform/api/quic_flags.h",
         "quiche/quic/platform/api/quic_iovec.h",
         "quiche/quic/platform/api/quic_logging.h",
-        "quiche/quic/platform/api/quic_map_util.h",
         "quiche/quic/platform/api/quic_mem_slice.h",
         "quiche/quic/platform/api/quic_reference_counted.h",
         "quiche/quic/platform/api/quic_server_stats.h",
@@ -1605,6 +1587,7 @@ envoy_cc_library(
         ":quic_core_time_lib",
         ":quic_core_types_lib",
         ":quic_platform",
+        ":quiche_common_print_elements_lib",
     ],
 )
 
@@ -2683,6 +2666,7 @@ envoy_cc_library(
         ":quic_core_versions_lib",
         ":quic_platform_base",
         ":quiche_common_circular_deque_lib",
+        ":quiche_common_print_elements_lib",
     ],
 )
 
@@ -3124,6 +3108,7 @@ envoy_cc_library(
         ":quic_core_unacked_packet_map_lib",
         ":quic_core_utils_lib",
         ":quic_platform_base",
+        ":quiche_common_print_elements_lib",
     ],
 )
 
@@ -4017,8 +4002,6 @@ envoy_cc_library(
     hdrs = [
         "quiche/common/platform/default/quiche_platform_impl/quic_mutex_impl.h",
         "quiche/common/platform/default/quiche_platform_impl/quic_testvalue_impl.h",
-        "quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h",
-        "quiche/common/platform/default/quiche_platform_impl/quiche_estimate_memory_usage_impl.h",
         "quiche/common/platform/default/quiche_platform_impl/quiche_prefetch_impl.h",
         "quiche/common/platform/default/quiche_platform_impl/quiche_sleep_impl.h",
         "quiche/common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
@@ -4058,6 +4041,19 @@ envoy_cc_test_library(
     ],
 )
 
+envoy_cc_library(
+    name = "quiche_common_print_elements_lib",
+    hdrs = ["quiche/common/print_elements.h"],
+    external_deps = [
+        "abseil_inlined_vector",
+    ],
+    repository = "@envoy",
+    tags = ["nofips"],
+    deps = [
+        ":quiche_common_platform_export",
+    ],
+)
+
 envoy_cc_test_library(
     name = "quiche_common_test_tools_test_utils_lib",
     srcs = ["quiche/common/test_tools/quiche_test_utils.cc"],
@@ -4188,10 +4184,8 @@ envoy_cc_test(
 envoy_cc_test(
     name = "quic_platform_api_test",
     srcs = [
-        "quiche/quic/platform/api/quic_containers_test.cc",
         "quiche/quic/platform/api/quic_mem_slice_span_test.cc",
-        # Re-enable it when tests pass.
-        # "quiche/quic/platform/api/quic_mem_slice_storage_test.cc",
+        "quiche/quic/platform/api/quic_mem_slice_storage_test.cc",
         "quiche/quic/platform/api/quic_mem_slice_test.cc",
         "quiche/quic/platform/api/quic_reference_counted_test.cc",
     ],

bazel/external/quiche.genrule_cmd

@@ -51,6 +51,7 @@ cat <<EOF >sed_commands
 
 # Use envoy specific implementations for below platform APIs.
 /^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"source/common/quic/platform/quiche_logging_impl.h!
+/^#include/ s!"quiche_platform_impl/quiche_bug_tracker_impl.h!"source/common/quic/platform/quiche_bug_tracker_impl.h!
 
 # The reset platform APIs use the QUICHE default implementations.
 /^#include/ s!"quiche_platform_impl/!"quiche/common/platform/default/quiche_platform_impl/!

bazel/repository_locations.bzl

@@ -808,12 +808,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://quiche.googlesource.com/quiche",
-        version = "aee86fb6ffce85e884a6f613ae5f47ce2c6b1e23",
-        sha256 = "a1b2c0cdd53a3a932db991bee736c6df20912c3d8070be9fbb4152575837cbf9",
+        version = "5dd7a030209f9a6b5043bebd8ac3ee54f18d1d08",
+        sha256 = "306342cb35cb9d8baea079c7b924b0133c53cbf182b251655e589d3b4604dc41",
         # Static snapshot of https://quiche.googlesource.com/quiche/+archive/{version}.tar.gz
         urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"],
         use_category = ["dataplane_core"],
-        release_date = "2021-06-02",
+        release_date = "2021-07-16",
         cpe = "N/A",
     ),
     com_googlesource_googleurl = dict(

source/common/quic/platform/BUILD

@@ -64,10 +64,8 @@ envoy_cc_library(
 envoy_cc_library(
     name = "http2_platform_impl_lib",
     hdrs = [
-        "http2_containers_impl.h",
         "http2_logging_impl.h",
         "http2_macros_impl.h",
-        "http2_string_utils_impl.h",
     ],
     external_deps = [
         "abseil_base",
@@ -90,7 +88,10 @@ envoy_cc_library(
 
 envoy_cc_library(
     name = "quic_platform_logging_impl_lib",
-    srcs = ["quic_logging_impl.cc"],
+    srcs = [
+        "quic_logging_impl.cc",
+        "quiche_bug_tracker_impl.cc",
+    ],
     hdrs = [
         "quic_logging_impl.h",
         "quiche_bug_tracker_impl.h",
@@ -115,7 +116,6 @@ envoy_cc_library(
         "quic_error_code_wrappers_impl.h",
         "quic_flags_impl.h",
         "quic_iovec_impl.h",
-        "quic_map_util_impl.h",
         "quic_mem_slice_impl.h",
         "quic_reference_counted_impl.h",
         "quic_server_stats_impl.h",
@@ -151,11 +151,9 @@ envoy_cc_library(
 envoy_cc_library(
     name = "quic_platform_impl_lib",
     srcs = [
-        "quic_file_utils_impl.cc",
         "quic_hostname_utils_impl.cc",
     ],
     hdrs = [
-        "quic_file_utils_impl.h",
         "quic_hostname_utils_impl.h",
         "quic_mutex_impl.h",
         "quic_pcc_sender_impl.h",
@@ -259,9 +257,7 @@ envoy_cc_library(
     name = "spdy_platform_impl_lib",
     hdrs = [
         "spdy_bug_tracker_impl.h",
-        "spdy_containers_impl.h",
         "spdy_logging_impl.h",
-        "spdy_string_utils_impl.h",
         "spdy_test_utils_prod_impl.h",
     ],
     external_deps = [