From 362e5784b5e0912e30932014913c6db530ba0cea Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 29 Jan 2024 23:24:36 +0000
Subject: [PATCH] Roll boringssl to d24a38200fef19150eef00cad35b138936c08767.

TEST=ci
Change-Id: I789fd6c238743f040c229e342880392af2e118ae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/348761
Reviewed-by: Brian Quinlan <bquinlan@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 DEPS                              |  4 ++--
 build/config/compiler/BUILD.gn    | 10 ++++++++++
 runtime/bin/secure_socket_utils.h |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index ec5902481a3..7fe86f53338 100644
--- a/DEPS
+++ b/DEPS
@@ -96,8 +96,8 @@ vars = {
 
   # Prefer to use hashes of binaryen that have been reviewed & rolled into g3.
   "binaryen_rev" : "a51bd6df919a5b79574f0996a760cc20cb05697e",
-  "boringssl_gen_rev": "a468ba9fec3f59edf46a7db98caaca893e1e4d96",
-  "boringssl_rev": "74646566e93de7551bfdfc5f49de7462f13d1d05",
+  "boringssl_gen_rev": "9c7294fd58261a79794f5afaa26598cf1442ad20",
+  "boringssl_rev": "d24a38200fef19150eef00cad35b138936c08767",
   "browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22
   "devtools_rev": "226af81369622cce9c0d98adbe31598208a27cc0",
   "icu_rev": "81d656878ec611cb0b42d52c82e9dae93920d9ba",
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 4dea19a8a7f..b5855f3631b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -449,8 +449,10 @@ config("compiler") {
 
 config("cxx_version_default") {
   if (is_win) {
+    cflags_c = [ "/std:c17" ]
     cc_std = [ "/std:c++17" ]
   } else {
+    cflags_c = [ "-std=c17" ]
     cc_std = [ "-std=c++17" ]
   }
   cflags_cc = cc_std
@@ -459,8 +461,10 @@ config("cxx_version_default") {
 
 config("cxx_version_11") {
   if (is_win) {
+    cflags_c = [ "/std:c11" ]
     cc_std = [ "/std:c++11" ]
   } else {
+    cflags_c = [ "-std=c11" ]
     cc_std = [ "-std=c++11" ]
   }
   cflags_cc = cc_std
@@ -469,8 +473,10 @@ config("cxx_version_11") {
 
 config("cxx_version_14") {
   if (is_win) {
+    cflags_c = [ "/std:c14" ]
     cc_std = [ "/std:c++14" ]
   } else {
+    cflags_c = [ "-std=c14" ]
     cc_std = [ "-std=c++14" ]
   }
   cflags_cc = cc_std
@@ -479,8 +485,10 @@ config("cxx_version_14") {
 
 config("cxx_version_17") {
   if (is_win) {
+    cflags_c = [ "/std:c17" ]
     cc_std = [ "/std:c++17" ]
   } else {
+    cflags_c = [ "-std=c17" ]
     cc_std = [ "-std=c++17" ]
   }
   cflags_cc = cc_std
@@ -489,8 +497,10 @@ config("cxx_version_17") {
 
 config("cxx_version_20") {
   if (is_win) {
+    cflags_c = [ "/std:c20" ]
     cc_std = [ "/std:c++20" ]
   } else {
+    cflags_c = [ "-std=c20" ]
     cc_std = [ "-std=c++20" ]
   }
   cflags_cc = cc_std
diff --git a/runtime/bin/secure_socket_utils.h b/runtime/bin/secure_socket_utils.h
index 2dafb72ce88..47f2f60af03 100644
--- a/runtime/bin/secure_socket_utils.h
+++ b/runtime/bin/secure_socket_utils.h
@@ -152,8 +152,8 @@ class ScopedSSLStackType {
 
   ~ScopedSSLStackType() {
     if (obj_ != nullptr) {
-      sk_pop_free(reinterpret_cast<_STACK*>(obj_),
-                  reinterpret_cast<void (*)(void*)>(func));
+      func(reinterpret_cast<E*>(
+          OPENSSL_sk_pop(reinterpret_cast<OPENSSL_STACK*>(obj_))));
     }
   }