Skip to content

Support s2n on macOS #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sfod wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Support s2n on macOS #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
590fc47
Check s2n on macos
sfodagain May 6, 2026
4ed3a76
bump aws-c-io
sfodagain May 6, 2026
0565bc5
bump aws-c-io and enable s2n
sfodagain May 6, 2026
6101136
Set CMAKE_NO_SYSTEM_FROM_IMPORTED
sfodagain May 6, 2026
743b9b6
check test
sfodagain May 6, 2026
09ff3d5
Skip pkcs12 test
sfodagain May 7, 2026
d322027
Skip pkcs12 test
sfodagain May 7, 2026
8c609cf
Merge branch 'main' into runtime-tls-switch-2
sfod May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,26 @@ jobs:
macos-x64:
runs-on: macos-15-large #latest
steps:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Checkout Sources
uses: actions/checkout@v4
with:
submodules: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
chmod a+x builder
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream --cmake-extra=-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
python3 codebuild/macos_compatibility_check.py

macos-s2n:
runs-on: macos-15 #latest
env:
AWS_CRT_USE_NON_FIPS_TLS_13: 1
steps:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
Expand All @@ -238,6 +258,26 @@ jobs:
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
python3 codebuild/macos_compatibility_check.py

macos-x64-s2n:
runs-on: macos-15-large #latest
env:
AWS_CRT_USE_NON_FIPS_TLS_13: 1
steps:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Checkout Sources
uses: actions/checkout@v4
with:
submodules: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
chmod a+x builder
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream --cmake-extra=-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
python3 codebuild/macos_compatibility_check.py

# check that docs can still build
check-docs:
runs-on: ubuntu-22.04 # use same version as docs.yml
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if (BUILD_DEPS)
set(IN_SOURCE_BUILD ON)
set(BUILD_TESTING OFF)
add_subdirectory(crt/aws-c-common)
if (UNIX AND NOT APPLE)
if (UNIX)
include(AwsPrebuildDependency)

set(AWSLC_CMAKE_ARGUMENTS
Expand Down Expand Up @@ -72,6 +72,7 @@ if (BUILD_DEPS)
)

set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N")
set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON CACHE BOOL "")
add_subdirectory(crt/s2n)
endif()
add_subdirectory(crt/aws-c-sdkutils)
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-io
Open in desktop
Submodule aws-c-io updated 44 files
+29 −0 .builder/actions/custom_keychain_test_setup.py
+14 −3 .builder/actions/pkcs11_test_setup.py
+53 −16 .builder/actions/tls_server_setup.py
+38 −2 .github/workflows/ci.yml
+3 −2 CMakeLists.txt
+4 −1 builder.json
+1 −1 cmake/aws-c-io-config.cmake
+9 −0 include/aws/io/pem.h
+30 −0 include/aws/io/private/tls_channel_handler_private.h
+42 −13 source/darwin/secure_transport_tls_channel_handler.c
+3 −1 source/io.c
+62 −0 source/pem.c
+169 −0 source/s2n/s2n_apple_keychain.c
+82 −20 source/s2n/s2n_tls_channel_handler.c
+118 −11 source/tls_channel_handler.c
+48 −18 source/windows/secure_channel_tls_handler.c
+10 −3 tests/CMakeLists.txt
+24 −2 tests/event_loop_test.c
+145 −0 tests/pem_test.c
+135 −0 tests/resources/generateCerts.sh
+22 −0 tests/resources/import_custom_cert_to_keychain.sh
+28 −0 tests/resources/mtls_device.key
+24 −0 tests/resources/mtls_device.pem.crt
+28 −0 tests/resources/mtls_device_root_ca.key
+24 −0 tests/resources/mtls_device_root_ca.pem.crt
+28 −0 tests/resources/mtls_server.key
+24 −0 tests/resources/mtls_server.pem.crt
+28 −0 tests/resources/mtls_server_root_ca.key
+24 −0 tests/resources/mtls_server_root_ca.pem.crt
+31 −0 tests/resources/mtls_server_root_ca_trust_settings.plist
+28 −0 tests/resources/mtls_untrusted_server.key
+24 −0 tests/resources/mtls_untrusted_server.pem.crt
+28 −0 tests/resources/mtls_untrusted_server_root_ca.key
+24 −0 tests/resources/mtls_untrusted_server_root_ca.pem.crt
+0 −28 tests/resources/tls13_device.key
+0 −24 tests/resources/tls13_device.pem.crt
+0 −28 tests/resources/tls13_device_root_ca.key
+0 −24 tests/resources/tls13_device_root_ca.pem.crt
+0 −28 tests/resources/tls13_server.key
+0 −24 tests/resources/tls13_server.pem.crt
+0 −28 tests/resources/tls13_server_root_ca.key
+0 −24 tests/resources/tls13_server_root_ca.pem.crt
+139 −48 tests/tls_handler_test.c
+59 −7 tests/tls_server/tls_server.py
2 changes: 2 additions & 0 deletions src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3425,6 +3425,8 @@ public void ConnDC_Cred_UC2() throws Exception {
Assume.assumeNotNull(
AWS_TEST_MQTT5_IOT_CORE_HOST, AWS_TEST_MQTT5_IOT_CORE_PKCS12_KEY,
AWS_TEST_MQTT5_IOT_CORE_PKCS12_KEY_PASSWORD);
Assume.assumeTrue("Skipped: AWS_CRT_USE_NON_FIPS_TLS_13 is set",
System.getenv("AWS_CRT_USE_NON_FIPS_TLS_13") == null);

TestUtils.doRetryableTest(this::doConnDC_Cred_UC2Test, TestUtils::isRetryableTimeout, MAX_TEST_RETRIES, TEST_RETRY_SLEEP_MILLIS);

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/software/amazon/awssdk/crt/test/MqttClientConnectionMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ public void ConnDC_Cred_UC2() throws Exception {
Assume.assumeNotNull(
AWS_TEST_MQTT311_IOT_CORE_HOST, AWS_TEST_MQTT311_IOT_CORE_PKCS12_KEY,
AWS_TEST_MQTT311_IOT_CORE_PKCS12_KEY_PASSWORD);
Assume.assumeTrue("Skipped: AWS_CRT_USE_NON_FIPS_TLS_13 is set",
System.getenv("AWS_CRT_USE_NON_FIPS_TLS_13") == null);

TestUtils.doRetryableTest(this::doConnDC_Cred_UC2Test, TestUtils::isRetryableTimeout, MAX_TEST_RETRIES, TEST_RETRY_SLEEP_MILLIS);

Expand Down
Loading