Skip to content

Commit

Permalink
Fix S2N build on Linux (#186)
Browse files Browse the repository at this point in the history
  • Loading branch information
waahm7 committed May 10, 2023
1 parent 3f1f88a commit 838deb5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion aws-common-runtime/s2n
Submodule s2n updated 45 files
+0 −2 CMakeLists.txt
+29 −1 api/s2n.h
+14 −7 bin/echo.c
+1 −1 bindings/rust/s2n-tls-sys/Cargo.toml
+6 −4 bindings/rust/s2n-tls-sys/build.rs
+2 −5 bindings/rust/s2n-tls-sys/tests/s2n_init.rs
+2 −2 bindings/rust/s2n-tls-tokio/Cargo.toml
+2 −2 bindings/rust/s2n-tls/Cargo.toml
+1 −1 codebuild/bin/build_aws_crt_cpp.sh
+24 −0 codebuild/bin/clang_format_changed_files.sh
+25 −0 codebuild/spec/buildspec_32bit_cross_compile.yml
+7 −0 codebuild/spec/buildspec_omnibus.yml
+3 −0 crypto/s2n_cipher.h
+6 −35 crypto/s2n_libcrypto.c
+0 −2 crypto/s2n_libcrypto.h
+1 −0 crypto/s2n_openssl.h
+61 −44 crypto/s2n_stream_cipher_rc4.c
+19 −1 docs/DEVELOPMENT-GUIDE.md
+28 −3 docs/USAGE-GUIDE.md
+0 −46 module.modulemap
+ tests/fuzz/corpus/s2n_server_cert_recv_test/29e2dcfbb16f63bb0254df7585a15bb6fb5e927d
+ tests/fuzz/corpus/s2n_server_cert_recv_test/40651c21ac7548d1775db7f38bdca7e532c702ba
+ tests/fuzz/corpus/s2n_server_cert_recv_test/88440333f9d7f56ee743662b95c0a2260fadcffc
+ tests/fuzz/corpus/s2n_server_cert_recv_test/8e482d4c92270e0ae15a2ad5e7b7f0c9739d427f
+0 −0 tests/fuzz/corpus/s2n_server_cert_recv_test/b48f491783e98de10682f2d4455dfce5bdc3c233
+ tests/fuzz/corpus/s2n_server_cert_recv_test/e6ed2fb522ecdbd10e12180568c5e50d68f7beff
+0 −292 tests/fuzz/corpus/s2n_server_fuzz_test/crashoutput.txt
+7 −1 tests/integrationv2/test_renegotiate.py
+120 −11 tests/unit/s2n_alerts_protocol_test.c
+29 −0 tests/unit/s2n_cipher_suite_match_test.c
+199 −0 tests/unit/s2n_config_test.c
+14 −0 tests/unit/s2n_random_test.c
+13 −4 tests/unit/s2n_rc4_test.c
+6 −12 tests/unit/s2n_self_talk_nonblocking_test.c
+16 −3 tests/unit/s2n_session_ticket_test.c
+249 −18 tests/unit/s2n_shutdown_test.c
+6 −0 tls/s2n_cipher_suites.c
+37 −2 tls/s2n_config.c
+3 −0 tls/s2n_config.h
+20 −7 tls/s2n_recv.c
+66 −9 tls/s2n_shutdown.c
+1 −16 tls/s2n_x509_validator.c
+3 −3 tls/s2n_x509_validator.h
+0 −2 utils/s2n_init.c
+1 −0 utils/s2n_random.c

0 comments on commit 838deb5

Please sign in to comment.