From 838deb5de707f157986e4baa95439cbcac9f3fcf Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 10 May 2023 14:18:35 -0700 Subject: [PATCH] Fix S2N build on Linux (#186) --- Package.swift | 5 ++--- aws-common-runtime/s2n | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 4c5b57dd2..c4d2b7881 100644 --- a/Package.swift +++ b/Package.swift @@ -58,7 +58,6 @@ var awsCCalPlatformExcludes = [ "bin", "include/aws/cal/private", "CODE_OF_CONDUCT.md", - "sanitizer-blacklist.txt", "ecdsa-fuzz-corpus/windows/p256_sig_corpus.txt", "ecdsa-fuzz-corpus/darwin/p256_sig_corpus.txt"] + excludesFromAll @@ -87,7 +86,7 @@ let s2nExcludes = ["bin", "codebuild", "coverage", "docker-images", "scripts/", "codebuild", "bindings/rust", "VERSIONING.rst", "tests", "cmake/s2n-config.cmake", "CMakeLists.txt", "README.md", "cmake", "NOTICE", "LICENSE"] packageTargets.append(.target( - name: "S2N", + name: "S2N_TLS", dependencies: ["LibCrypto"], path: "aws-common-runtime/s2n", exclude: s2nExcludes, @@ -109,7 +108,7 @@ var awsCIoPlatformExcludes = ["docs", "CODE_OF_CONDUCT.md", "codebuild", "PKCS11 var cSettingsIO = cSettings #if os(Linux) -ioDependencies.append("S2N") +ioDependencies.append("S2N_TLS") cSettingsIO.append(.define("USE_S2N")) #endif diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n index 635893c64..9b7b1f334 160000 --- a/aws-common-runtime/s2n +++ b/aws-common-runtime/s2n @@ -1 +1 @@ -Subproject commit 635893c64ef42f8ac4bb509dd195a2027174171f +Subproject commit 9b7b1f334a4ab33397174e505955231ff77b3f85