Update quiche from Chromium 114.0.5735.358

Issue: 326748668 Reviewed-on: #3044
youtube · Apr 24, 2024 · 1eab626 · 1eab626
2 parents 28f7adb + 6dceade
commit 1eab626
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/net/third_party/quiche/src/METADATA b/net/third_party/quiche/src/METADATA
@@ -5,13 +5,13 @@ description:
 third_party {
   identifier {
     type: "ChromiumVersion"
-    value: "114.0.5735.331"  # from https://chromereleases.googleblog.com/2023/08/long-term-support-channel-update-for_23.html
+    value: "114.0.5735.358"  # from https://chromereleases.googleblog.com/2024/03/long-term-support-channel-update-for_26.html
   }
   identifier {
     type: "Git"
     value: "https://quiche.googlesource.com/quiche.git"
     version: "02c69dd28eef7ef2618782e8d54d53c14ae64382"
-    # from https://chromium.googlesource.com/chromium/src/+/114.0.5735.331/DEPS#427
+    # from https://chromium.googlesource.com/chromium/src/+/114.0.5735.358/DEPS#427
   }
   last_upgrade_date {
     year: 2023

diff --git a/...party/quiche/src/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.cc b/...party/quiche/src/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.cc
@@ -19,11 +19,12 @@
 // Select the right macro based on the number of arguments.
 #define MY_CR_EXPAND_ARG(arg) arg
 #define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6
+#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...)                    \
+  GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \
+              DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE)
 #define QUIC_PROTOCOL_FLAG(...)                    \
   MY_CR_EXPAND_ARG(GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \
               DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE)(__VA_ARGS__))
-// #define QUIC_PROTOCOL_FLAG(...) \
-//   QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
 
 #include "quiche/quic/core/quic_protocol_flags_list.h"
 

diff --git a/net/third_party/quiche/src/quiche/common/quiche_ip_address.h b/net/third_party/quiche/src/quiche/common/quiche_ip_address.h
@@ -6,7 +6,7 @@
 #define QUICHE_COMMON_QUICHE_IP_ADDRESS_H_
 
 #include <cstdint>
-#if defined(_WIN32) && defined(COBALT_PENDING_CLEAN_UP)
+#if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include "starboard/shared/win32/posix_emu/include/remove_problematic_windows_macros.h"

diff --git a/net/third_party/quiche/src/quiche/quic/core/crypto/crypto_utils.cc b/net/third_party/quiche/src/quiche/quic/core/crypto/crypto_utils.cc
@@ -780,7 +780,7 @@ bool CryptoUtils::GetSSLCapabilities(const SSL* ssl,
   bssl::ScopedCBB cbb;
 
   if (!CBB_init(cbb.get(), 128) ||
-      // !SSL_serialize_capabilities(ssl, cbb.get()) ||
+      !SSL_serialize_capabilities(ssl, cbb.get()) ||
       !CBB_finish(cbb.get(), &buffer, capabilities_len)) {
     return false;
   }