Skip to content

Commit 362e578

Browse files
rmacnak-googleCommit Queue
authored and
Commit Queue
committed
Roll boringssl to d24a38200fef19150eef00cad35b138936c08767.
TEST=ci Change-Id: I789fd6c238743f040c229e342880392af2e118ae Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/348761 Reviewed-by: Brian Quinlan <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent af79f2f commit 362e578

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ vars = {
9696

9797
# Prefer to use hashes of binaryen that have been reviewed & rolled into g3.
9898
"binaryen_rev" : "a51bd6df919a5b79574f0996a760cc20cb05697e",
99-
"boringssl_gen_rev": "a468ba9fec3f59edf46a7db98caaca893e1e4d96",
100-
"boringssl_rev": "74646566e93de7551bfdfc5f49de7462f13d1d05",
99+
"boringssl_gen_rev": "9c7294fd58261a79794f5afaa26598cf1442ad20",
100+
"boringssl_rev": "d24a38200fef19150eef00cad35b138936c08767",
101101
"browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22
102102
"devtools_rev": "226af81369622cce9c0d98adbe31598208a27cc0",
103103
"icu_rev": "81d656878ec611cb0b42d52c82e9dae93920d9ba",

build/config/compiler/BUILD.gn

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,10 @@ config("compiler") {
449449

450450
config("cxx_version_default") {
451451
if (is_win) {
452+
cflags_c = [ "/std:c17" ]
452453
cc_std = [ "/std:c++17" ]
453454
} else {
455+
cflags_c = [ "-std=c17" ]
454456
cc_std = [ "-std=c++17" ]
455457
}
456458
cflags_cc = cc_std
@@ -459,8 +461,10 @@ config("cxx_version_default") {
459461

460462
config("cxx_version_11") {
461463
if (is_win) {
464+
cflags_c = [ "/std:c11" ]
462465
cc_std = [ "/std:c++11" ]
463466
} else {
467+
cflags_c = [ "-std=c11" ]
464468
cc_std = [ "-std=c++11" ]
465469
}
466470
cflags_cc = cc_std
@@ -469,8 +473,10 @@ config("cxx_version_11") {
469473

470474
config("cxx_version_14") {
471475
if (is_win) {
476+
cflags_c = [ "/std:c14" ]
472477
cc_std = [ "/std:c++14" ]
473478
} else {
479+
cflags_c = [ "-std=c14" ]
474480
cc_std = [ "-std=c++14" ]
475481
}
476482
cflags_cc = cc_std
@@ -479,8 +485,10 @@ config("cxx_version_14") {
479485

480486
config("cxx_version_17") {
481487
if (is_win) {
488+
cflags_c = [ "/std:c17" ]
482489
cc_std = [ "/std:c++17" ]
483490
} else {
491+
cflags_c = [ "-std=c17" ]
484492
cc_std = [ "-std=c++17" ]
485493
}
486494
cflags_cc = cc_std
@@ -489,8 +497,10 @@ config("cxx_version_17") {
489497

490498
config("cxx_version_20") {
491499
if (is_win) {
500+
cflags_c = [ "/std:c20" ]
492501
cc_std = [ "/std:c++20" ]
493502
} else {
503+
cflags_c = [ "-std=c20" ]
494504
cc_std = [ "-std=c++20" ]
495505
}
496506
cflags_cc = cc_std

runtime/bin/secure_socket_utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ class ScopedSSLStackType {
152152

153153
~ScopedSSLStackType() {
154154
if (obj_ != nullptr) {
155-
sk_pop_free(reinterpret_cast<_STACK*>(obj_),
156-
reinterpret_cast<void (*)(void*)>(func));
155+
func(reinterpret_cast<E*>(
156+
OPENSSL_sk_pop(reinterpret_cast<OPENSSL_STACK*>(obj_))));
157157
}
158158
}
159159

0 commit comments

Comments
 (0)