From d8f6b182597c552a8ed801f9a92ee0a9f862511d Mon Sep 17 00:00:00 2001 From: Igor Abdrakhimov Date: Wed, 17 Jun 2026 09:59:12 -0700 Subject: [PATCH 1/2] Check s2n-tls fix --- CMakeLists.txt | 11 ----------- crt/s2n | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 699e248fc..21d57a475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,18 +74,7 @@ if (BUILD_DEPS) ) set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N") - # On Intel Macs, Homebrew installs to /usr/local which is in the default header search path. - # Without this, s2n's libcrypto detection picks up Homebrew's OpenSSL instead of bundled aws-lc. - # ARM Macs use /opt/homebrew (not in default search paths) so they don't need this. - if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") - set(_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED ${CMAKE_NO_SYSTEM_FROM_IMPORTED}) - set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON) - endif() add_subdirectory(crt/s2n) - if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") - set(CMAKE_NO_SYSTEM_FROM_IMPORTED ${_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED}) - unset(_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED) - endif() endif() add_subdirectory(crt/aws-c-sdkutils) add_subdirectory(crt/aws-c-io) diff --git a/crt/s2n b/crt/s2n index 211695cb9..f4d03e16d 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 211695cb91f5b74b64a81ebb3045ec3d7d5ab264 +Subproject commit f4d03e16d7f32bb3ad50a9a9e35e8652dbb82ad0 From 229ce13296bf2681901e1f7f3b678123dc185f82 Mon Sep 17 00:00:00 2001 From: Igor Abdrakhimov Date: Wed, 17 Jun 2026 10:06:59 -0700 Subject: [PATCH 2/2] Reverse s2n-tls --- crt/s2n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/s2n b/crt/s2n index f4d03e16d..211695cb9 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit f4d03e16d7f32bb3ad50a9a9e35e8652dbb82ad0 +Subproject commit 211695cb91f5b74b64a81ebb3045ec3d7d5ab264