feat: add Linux support (#20)

Author: kneekey23

.clang-format

@@ -0,0 +1,58 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Mozilla
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakStringLiterals: true
+ColumnLimit:     120
+ContinuationIndentWidth: 4
+DerivePointerAlignment: false
+IncludeBlocks:   Preserve
+IndentCaseLabels: true
+IndentPPDirectives: AfterHash
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 100000
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+...
+

.dockerignore

@@ -0,0 +1,5 @@
+.git/
+.build/
+!.build/checkouts/
+!.build/repositories/
+!.build/workspace-state.json

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - '!master'
 
 env:
-  BUILDER_VERSION: v0.8.0
+  BUILDER_VERSION: v0.8.15
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-swift
@@ -82,9 +82,11 @@ jobs:
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
           export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/${{ matrix.image }}:${{ env.BUILDER_VERSION }}
           docker pull $DOCKER_IMAGE
-          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream --compiler=clang-${{ matrix.version }}
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
   osx:
-    runs-on: macos-latest
+    runs-on: macos-11
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.5.app
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v2
@@ -96,7 +98,9 @@ jobs:
           chmod a+x builder
           ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
   ios:
-    runs-on: macos-latest
+    runs-on: macos-11
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.5.app
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v2

.gitmodules

@@ -5,8 +5,8 @@
 	path = aws-common-runtime/aws-c-io
 	url = https://github.com/awslabs/aws-c-io.git
 [submodule "aws-common-runtime/s2n"]
-	path = aws-common-runtime/s2n
-	url = https://github.com/awslabs/s2n.git
+	path = S2N/s2n
+	url = https://github.com/aws/s2n-tls.git
 [submodule "aws-common-runtime/aws-c-compression"]
 	path = aws-common-runtime/aws-c-compression
 	url = https://github.com/awslabs/aws-c-compression.git

Dockerfile

@@ -0,0 +1,16 @@
+FROM swift:5.4-focal
+
+WORKDIR /package
+
+COPY . ./
+
+# to test on al2 swift images uncomment this and comment out other line.
+# RUN yum -y install openssl-devel
+RUN apt-get update -qq
+RUN apt-get -y install libssl-dev
+
+RUN swift package clean
+
+RUN swift build
+
+CMD ["swift", "test", "-Xcc", "-g"]

Package.swift

@@ -1,17 +1,36 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.4
 import PackageDescription
 
+var packageDependencies: [Package.Dependency] = []
+var calDependencies: [Target.Dependency] = ["AwsCCommon"]
+var ioDependencies: [Target.Dependency] = ["AwsCCommon", "AwsCCal"]
+
+#if os(Linux)
+packageDependencies.append(.package(name: "S2N", path: "./S2N"))
+
+ioDependencies.append(.product(name: "S2N", package: "S2N"))
+calDependencies.append(.product(name: "LibCrypto", package: "S2N"))
+#endif
+
 var package = Package(name: "AwsCrt",
-                      platforms: [.iOS(.v11), .macOS(.v10_14)],
-                      products: [
-                        .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]),
-                        .executable(name: "Elasticurl", targets: ["Elasticurl"])
-                      ])
+    platforms: [.iOS(.v11), .macOS(.v10_14)],
+    products: [
+      .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]),
+      .executable(name: "Elasticurl", targets: ["Elasticurl"])
+    ],
+    dependencies: packageDependencies
+)
+
+let excludesFromAll = ["bin", "tests", "cmake", "codebuild", "CONTRIBUTING.md",
+                       "LICENSE", "format-check.sh", "NOTICE", "builder.json",
+                       "sanitizer-blacklist.txt", "CMakeLists.txt", "README.md",
+                       "CODE_OF_CONDUCT.md", "build-deps.sh"]
 
 // aws-c-common config
-var awsCCommonPlatformExcludes = ["source/windows", "source/android", "AWSCRTAndroidTestRunner",
-                                  "cmake", "codebuild", "docker-images", "tests", "verification"]
-//var unsafeFlagsArray: [String] = []
+var awsCCommonPlatformExcludes = ["source/windows", "source/android",
+                                  "AWSCRTAndroidTestRunner", "docker-images", "verification",
+                                  "include/aws/common/"]
+awsCCommonPlatformExcludes.append(contentsOf: excludesFromAll)
 
 #if arch(i386) || arch(x86_64)
 awsCCommonPlatformExcludes.append("source/arch/arm")
@@ -33,7 +52,8 @@ awsCCommonPlatformExcludes.append("source/arch/intel/asm")
 awsCCommonPlatformExcludes.append("source/arch/arm/asm")
 #endif
 
-var awsCIoPlatformExcludes = ["tests", "cmake", "docs"]
+var awsCIoPlatformExcludes = ["docs"]
+awsCIoPlatformExcludes.append(contentsOf: excludesFromAll)
 
 #if os(macOS)
 awsCIoPlatformExcludes.append("source/windows")
@@ -50,46 +70,47 @@ awsCIoPlatformExcludes.append("source/bsd")
 awsCIoPlatformExcludes.append("source/darwin")
 #endif
 
-var awsCCalPlatformExcludes = ["tests", "cmake"]
+var awsCCalPlatformExcludes = ["include/aws/cal/private"]
+awsCCalPlatformExcludes.append(contentsOf: excludesFromAll)
 
 #if os(macOS)
 awsCCalPlatformExcludes.append("source/windows")
 awsCCalPlatformExcludes.append("source/unix")
 #elseif(Windows)
-awsCCalPlatformExcludes.append("source/darin")
+awsCCalPlatformExcludes.append("source/darwin")
 awsCCalPlatformExcludes.append("source/unix")
 #else
 awsCCalPlatformExcludes.append("source/windows")
 awsCCalPlatformExcludes.append("source/darwin")
 #endif
 
-var awsCCompressionPlatformExcludes = ["tests", "cmake", "codebuild", "source/huffman_generator/"]
-var awsCHttpPlatformExcludes = ["tests", "bin", "integration-testing", "continuous-delivery", "cmake", "codebuild"]
-var awsCAuthPlatformExcludes = ["tests"]
-var awsCMqttPlatformExcludes = ["tests", "cmake"]
+var awsCCompressionPlatformExcludes = ["source/huffman_generator/"]
+awsCCompressionPlatformExcludes.append(contentsOf: excludesFromAll)
+var awsCHttpPlatformExcludes = ["integration-testing", "continuous-delivery", "include/aws/http/private"]
+awsCHttpPlatformExcludes.append(contentsOf: excludesFromAll)
+let awsCAuthPlatformExcludes = excludesFromAll
+let awsCMqttPlatformExcludes = excludesFromAll
 
 package.targets = ( [
     .target(
         name: "AwsCPlatformConfig",
         path: "aws-common-runtime/config",
-        publicHeadersPath: "."
-    ),
+        publicHeadersPath: "."),
     .target(
         name: "AwsCCommon",
         dependencies: ["AwsCPlatformConfig"],
         path: "aws-common-runtime/aws-c-common",
         exclude: awsCCommonPlatformExcludes),
+    .target(
+        name: "AwsCCal",
+        dependencies: calDependencies,
+        path: "aws-common-runtime/aws-c-cal",
+        exclude: awsCCalPlatformExcludes),
     .target(
         name: "AwsCIo",
-        dependencies: ["AwsCCommon"],
+        dependencies: ioDependencies,
         path: "aws-common-runtime/aws-c-io",
         exclude: awsCIoPlatformExcludes),
-    .target(
-        name: "AwsCCal",
-        dependencies: ["AwsCCommon"],
-        path: "aws-common-runtime/aws-c-cal",
-        exclude: awsCCalPlatformExcludes
-    ),
     .target(
         name: "AwsCCompression",
         dependencies: ["AwsCCommon"],
@@ -98,7 +119,7 @@ package.targets = ( [
     ),
     .target(
         name: "AwsCHttp",
-        dependencies: ["AwsCCompression", "AwsCIo", "AwsCCommon"],
+        dependencies: ["AwsCCompression", "AwsCIo", "AwsCCal", "AwsCCommon"],
         path: "aws-common-runtime/aws-c-http",
         exclude: awsCHttpPlatformExcludes
     ),
@@ -110,9 +131,10 @@ package.targets = ( [
     ),
     .target(
         name: "AwsCMqtt",
-        dependencies: ["AwsCHttp", "AwsCCompression", "AwsCIo", "AwsCCommon"],
+        dependencies: ["AwsCHttp", "AwsCCompression", "AwsCIo", "AwsCCal", "AwsCCommon"],
         path: "aws-common-runtime/aws-c-mqtt",
-        exclude: awsCMqttPlatformExcludes
+        exclude: awsCMqttPlatformExcludes,
+        cSettings: [.define("AWS_MQTT_WITH_WEBSOCKETS")]
     ),
     .target(
         name: "AwsCommonRuntimeKit",
@@ -124,7 +146,7 @@ package.targets = ( [
         dependencies: ["AwsCommonRuntimeKit"],
         path: "Test"
     ),
-    .target(
+    .executableTarget(
         name: "Elasticurl",
         dependencies: ["AwsCommonRuntimeKit"],
         path: "Source/Elasticurl"

S2N/Package.swift

@@ -0,0 +1,51 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "S2N",
+    products: [
+        .library(
+            name: "S2N",
+            targets: ["S2N"]
+        ),
+        .library(
+            name: "LibCrypto",
+            targets: ["LibCrypto"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "S2N",
+            dependencies: ["LibCrypto"],
+            path: "s2n",
+            // add pq-crypto back after adding in platform and chipset detection
+            exclude: ["bin", "cmake", "codebuild", "coverage", "docker-images",
+                      "docs", "lib", "pq-crypto/bike_r1", "pq-crypto/bike_r2",
+                      "pq-crypto/bike_r3", "pq-crypto/kyber_90s_r2", "pq-crypto/kyber_r3",
+                      "pq-crypto/kyber_r2", "pq-crypto/sike_r1", "pq-crypto/sike_r2",
+                      "pq-crypto/README.md", "pq-crypto/Makefile", "pq-crypto/s2n_pq_asm.mk",
+                      "libcrypto-build", "scram", "tests",
+                      "s2n.mk", "Makefile", "stuffer/Makefile", "crypto/Makefile",
+                      "tls/Makefile", "utils/Makefile", "error/Makefile",
+                      "extensions/Makefile", "tls/extensions/Makefile",
+                      "codecov.yml", "scripts/", "tests", "cmake", "codebuild", "CONTRIBUTING.md",
+                      "LICENSE", "format-check.sh", "NOTICE", "builder.json",
+                      "sanitizer-blacklist.txt", "CMakeLists.txt", "README.md",
+                      "CODE_OF_CONDUCT.md", "build-deps.sh"],
+            publicHeadersPath: "api",
+            cSettings: [
+                .headerSearchPath("./"),
+                .define("POSIX_C_SOURCE=200809L"),
+                .define("S2N_NO_PQ")
+            ]
+        ),
+        .systemLibrary(
+            name: "LibCrypto",
+            pkgConfig: "libcrypto",
+            providers: [
+                .apt(["openssl libssl-dev"])
+    //add this back when swift pm get's their crap together \\  .yum(["openssl openssl-devel"])
+            ]
+        )
+    ]
+)

S2N/Sources/LibCrypto/module.modulemap

@@ -0,0 +1,7 @@
+
+module LibCrypto {
+    header "shim.h"
+    link "crypto"
+    export *
+}
+

S2N/Sources/LibCrypto/shim.h

@@ -0,0 +1,17 @@
+#ifndef OpenSSLHelper_h
+#define OpenSSLHelper_h
+
+#include <openssl/conf.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <openssl/md4.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/pkcs12.h>
+#include <openssl/x509v3.h>
+#include <openssl/x509.h>
+
+#endif
+

S2N/s2n

@@ -55,7 +55,7 @@ public final class TracingAllocator: Allocator {
 
     /**
      Creates an `Allocator` that doesn't track anything.
-     
+
      - Parameter allocator: The allocator to be traced.
      */
     public convenience init(_ allocator: Allocator = defaultAllocator) {
@@ -78,7 +78,7 @@ public final class TracingAllocator: Allocator {
      * - Parameter framesPerStack: How many frames to record for each allocation
      *   (8 as usually a good default to start with).
      */
-    public convenience init(tracingStacksOf allocator: Allocator, framesPerStack: Int = 8) {
+    public convenience init(tracingStacksOf allocator: Allocator, framesPerStack: Int = 16) {
         self.init(allocator, level: .stacks, framesPerStack: framesPerStack)
     }