awslabs
diff --git a/‎.github/build_windows_openssl.bat
Lines changed: 1 addition & 1 deletion b/‎.github/build_windows_openssl.bat
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/ci.yml
Lines changed: 47 additions & 33 deletions b/‎.github/workflows/ci.yml
Lines changed: 47 additions & 33 deletions
diff --git a/‎.github/workflows/codecov.yml
Lines changed: 17 additions & 9 deletions b/‎.github/workflows/codecov.yml
Lines changed: 17 additions & 9 deletions
diff --git a/‎.gitignore
Lines changed: 1 addition & 0 deletions b/‎.gitignore
Lines changed: 1 addition & 0 deletions
diff --git a/‎CMake/Dependencies/libawscpp-CMakeLists.txt
Lines changed: 14 additions & 0 deletions b/‎CMake/Dependencies/libawscpp-CMakeLists.txt
Lines changed: 14 additions & 0 deletions
diff --git a/‎CMake/Dependencies/libmbedtls-CMakeLists.txt
Lines changed: 2 additions & 0 deletions b/‎CMake/Dependencies/libmbedtls-CMakeLists.txt
Lines changed: 2 additions & 0 deletions
diff --git a/‎CMake/Dependencies/libopenssl-CMakeLists.txt
Lines changed: 14 additions & 1 deletion b/‎CMake/Dependencies/libopenssl-CMakeLists.txt
Lines changed: 14 additions & 1 deletion
diff --git a/‎CMake/Dependencies/libsrtp-CMakeLists.txt
Lines changed: 24 additions & 13 deletions b/‎CMake/Dependencies/libsrtp-CMakeLists.txt
Lines changed: 24 additions & 13 deletions
diff --git a/‎CMake/Utilities.cmake
Lines changed: 3 additions & 0 deletions b/‎CMake/Utilities.cmake
Lines changed: 3 additions & 0 deletions
@@ -2,5 +2,5 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Buil
 mkdir build
 cd build
 cmd.exe /c cmake -G "NMake Makefiles" ..
-cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
+cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
 nmake
@@ -28,8 +28,6 @@ jobs:
       CC: /usr/bin/clang
       CXX: /usr/bin/clang++
       AWS_KVS_LOG_LEVEL: 2
-      LDFLAGS: -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib
-      CPATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/
     permissions:
       id-token: write
       contents: read
@@ -80,8 +78,6 @@ jobs:
     runs-on: macos-11
     env:
       AWS_KVS_LOG_LEVEL: 2
-      LDFLAGS: -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib
-      CPATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/
     permissions:
       id-token: write
       contents: read
@@ -102,33 +98,6 @@ jobs:
         run:  |
           cd build
           ./tst/webrtc_client_test
-  linux-gcc-code-coverage:
-    runs-on: ubuntu-20.04
-    env:
-      AWS_KVS_LOG_LEVEL: 2
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Build repository
-        run: |
-          sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
-          mkdir build && cd build
-          cmake .. -DCODE_COVERAGE=TRUE -DBUILD_TEST=TRUE
-          make
-          ulimit -c unlimited -S
-          timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
-      - name: Code coverage
-        run: |
-          for test_file in $(find CMakeFiles/kvsWebrtcClient.dir CMakeFiles/kvsWebrtcSignalingClient.dir -name '*.gcno'); do gcov $test_file; done
-          bash <(curl -s https://codecov.io/bash)
   address-sanitizer:
     runs-on: ubuntu-20.04
     env:
@@ -152,6 +121,7 @@ jobs:
         run: |
           sudo apt clean && sudo apt update
           sudo apt-get -y install clang
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           # TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
@@ -186,6 +156,7 @@ jobs:
         run: |
           sudo apt clean && sudo apt update
           sudo apt-get -y install clang
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           # TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
@@ -241,6 +212,7 @@ jobs:
         run: |
           sudo apt clean && sudo apt update
           sudo apt-get -y install clang
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -278,10 +250,12 @@ jobs:
           sudo apt-get -q update
           sudo apt-get -y install gcc-4.4
           sudo apt-get -y install gdb
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE
+          # As per REAMDE here: https://github.com/aws/aws-sdk-cpp minimum supported GCC is 4.9 so we do not run those tests here
+          cmake .. -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF
           make
           ulimit -c unlimited -S
       - name: Run tests
@@ -306,7 +280,7 @@ jobs:
         run: |
           apk update
           apk upgrade
-          apk add alpine-sdk cmake clang linux-headers perl bash openssl-dev
+          apk add alpine-sdk cmake clang linux-headers perl bash openssl-dev zlib-dev curl-dev
       - name: Build Repository
         run: |
           mkdir build && cd build
@@ -337,6 +311,41 @@ jobs:
           sudo apt-get -q update
           sudo apt-get -y install gcc-4.4
           sudo apt-get -y install gdb
+          sudo apt-get -y install libcurl4-openssl-dev
+      - name: Build repository
+        run: |
+          mkdir build && cd build
+          cmake .. -DBUILD_TEST=TRUE -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON
+          make
+          ulimit -c unlimited -S
+      - name: Run tests
+        run:  |
+          cd build
+          timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
+  mbedtls-ubuntu-gcc-11:
+    runs-on: ubuntu-latest
+    env:
+      AWS_KVS_LOG_LEVEL: 2
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Install deps
+        run: |
+          sudo apt clean && sudo apt update
+          sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+          sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+          sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ jammy main'
+          sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ jammy universe'
+          sudo apt-get -q update
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           mkdir build && cd build
@@ -368,6 +377,7 @@ jobs:
         run: |
           sudo apt clean && sudo apt update
           sudo apt-get -y install clang
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -418,6 +428,10 @@ jobs:
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           aws-region: ${{ secrets.AWS_REGION }}
+      - name: Install dependencies
+        run: |
+          sudo apt clean && sudo apt update
+          sudo apt-get -y install libcurl4-openssl-dev
       - name: Build repository
         run: |
           # TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
 
@@ -10,28 +10,36 @@ on:
       - master
 jobs:
   linux-gcc-codecov:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    env:
+      AWS_KVS_LOG_LEVEL: 2
     permissions:
       id-token: write
       contents: read
     steps:
-      - name: Fetch
+      - name: Clone repository
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           aws-region: ${{ secrets.AWS_REGION }}
-      - name: Run code coverage
+      - name: Install dependencies
         run: |
-          mkdir build
-          cd build
+          sudo apt clean && sudo apt update
+          sudo apt-get -y install libcurl4-openssl-dev
+      - name: Build repository
+        run: |
+          sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+          mkdir build && cd build
           cmake .. -DCODE_COVERAGE=TRUE -DBUILD_TEST=TRUE
           make
-          export AWS_KVS_LOG_LEVEL=3
           ulimit -c unlimited -S
+      - name: Run tests
+        run:  |
+          cd build
           timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
+      - name: Code coverage
+        run: |
           for test_file in $(find CMakeFiles/kvsWebrtcClient.dir CMakeFiles/kvsWebrtcSignalingClient.dir -name '*.gcno'); do gcov $test_file; done
-          bash <(curl -s https://codecov.io/bash)
+          bash <(curl -s https://codecov.io/bash)
@@ -10,4 +10,5 @@ open-source/
 outputs
 tags
 CMakeLists.txt.user
+*.vscode
 *.swp
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.6.3)
+project(libawscpp-download NONE)
+include(ExternalProject)
+
+ExternalProject_Add(libawscpp-download
+    GIT_REPOSITORY    https://github.com/aws/aws-sdk-cpp.git
+    GIT_TAG           1.11.157
+    LIST_SEPARATOR    "|"
+    CMAKE_ARGS       -DBUILD_SHARED_LIBS=OFF
+                     -DBUILD_ONLY=kinesisvideo|kinesis-video-webrtc-storage
+                     -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
+    BUILD_ALWAYS      TRUE
+    TEST_COMMAND      ""
+)
@@ -16,6 +16,8 @@ else()
   set(CMAKE_MACOSX_RPATH 0)
 endif()
 
+message(STATUS "C flags here are ${CMAKE_C_FLAGS}")
+
 ExternalProject_Add(
   project_libmbedtls
   GIT_REPOSITORY  https://github.com/ARMmbed/mbedtls.git
 
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.6.3)
 
-project(libopenssl-download NONE)
+project(libopenssl-download LANGUAGES C)
 
 if (WIN32)
   find_program(MAKE_EXE NAMES nmake)
@@ -16,13 +16,26 @@ else()
     SET(OPENSSL_EXTRA ${OPENSSL_EXTRA} no-shared no-dso)
   endif()
 
+  if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "")
+      if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+        SET(OPENSSL_EXTRA ${OPENSSL_EXTRA} -I${CMAKE_OSX_SYSROOT}/usr/include -L${CMAKE_OSX_SYSROOT}/usr/lib)
+      endif()
+  endif()
+
   if (DEFINED BUILD_OPENSSL_PLATFORM AND NOT BUILD_OPENSSL_PLATFORM STREQUAL OFF)
     SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} no-async --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM} -Wno-nullability-completeness -Wno-expansion-to-defined)
   else()
     SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} -Wno-nullability-completeness -Wno-expansion-to-defined)
   endif()
+
 endif()
 
+
+message(STATUS "PREFIX is ${CMAKE_CURRENT_BINARY_DIR}/build")
+message(STATUS "CONFIGURE_COMMAND is ${CONFIGURE_COMMAND}")
+message(STATUS "BUILD_COMMAND is ${MAKE_EXE}")
+message(STATUS "INSTALL_COMMAND is ${MAKE_EXE} install_sw")
+
 include(ExternalProject)
 ExternalProject_Add(project_libopenssl
     GIT_REPOSITORY    https://github.com/openssl/openssl.git
 
@@ -1,18 +1,31 @@
 cmake_minimum_required(VERSION 3.6.3)
 
-project(libsrtp-download NONE)
+project(libsrtp-download LANGUAGES C)
 
 SET(CONFIGURE_COMMAND "")
 
 # There is known bug in libsrtp where cross compiling using configure on ARM fails. Do not
 # enable this option if cross compilng on ARM
 # Check https://github.com/cisco/libsrtp/pull/496
+
+
 if(BUILD_LIBSRTP_DESTINATION_PLATFORM STREQUAL BUILD_LIBSRTP_HOST_PLATFORM)
+
   if(UNIX OR APPLE)
-    if(USE_OPENSSL)
-      SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libsrtp/configure "CFLAGS=${CMAKE_C_FLAGS}" --prefix=${OPEN_SRC_INSTALL_PREFIX}  --enable-openssl --with-openssl-dir=${OPENSSL_DIR})
+
+    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libsrtp/configure CC=${CMAKE_C_COMPILER})
+
+    if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "")
+      if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+        SET(KVS_CFLAGS "-I${CMAKE_OSX_SYSROOT}/usr/include -Wno-error=implicit-function-declaration")
+        SET(CONFIGURE_COMMAND ${CONFIGURE_COMMAND} CFLAGS=${KVS_CFLAGS} LDFLAGS=-L${CMAKE_OSX_SYSROOT}/usr/lib)
+      endif()
+    endif()
+
+    if (USE_OPENSSL)
+      SET(CONFIGURE_COMMAND ${CONFIGURE_COMMAND} --prefix=${OPEN_SRC_INSTALL_PREFIX} --enable-openssl --with-openssl-dir=${OPENSSL_DIR})
     else()
-      SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libsrtp/configure "CFLAGS=${CMAKE_C_FLAGS}" --prefix=${OPEN_SRC_INSTALL_PREFIX})
+      SET(CONFIGURE_COMMAND ${CONFIGURE_COMMAND} --prefix=${OPEN_SRC_INSTALL_PREFIX})
     endif()
 
     if (DEFINED BUILD_LIBSRTP_DESTINATION_PLATFORM AND NOT BUILD_LIBSRTP_DESTINATION_PLATFORM STREQUAL OFF)
@@ -23,9 +36,6 @@ if(BUILD_LIBSRTP_DESTINATION_PLATFORM STREQUAL BUILD_LIBSRTP_HOST_PLATFORM)
       set(CONFIGURE_COMMAND ${CONFIGURE_COMMAND} --build=${BUILD_LIBSRTP_HOST_PLATFORM})
     endif()
 
-    if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot${CMAKE_OSX_SYSROOT}")
-    endif()
   endif()
 endif()
 
@@ -41,18 +51,19 @@ else()
   set(LIBSRTP_ENABLE_OPENSSL OFF)
 endif()
 
+message(STATUS "CONFIGURE_COMMAND is ${CONFIGURE_COMMAND}")
+
 
 include(ExternalProject)
 ExternalProject_Add(project_libsrtp
     GIT_REPOSITORY    https://github.com/cisco/libsrtp.git
     GIT_TAG           bd0f27ec0e299ad101a396dde3f7c90d48efc8fc
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
-    CMAKE_ARGS        -D CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-                      -D CMAKE_INSTALL_PREFIX:STRING=${OPEN_SRC_INSTALL_PREFIX}
-                      -D ENABLE_OPENSSL=${LIBSRTP_ENABLE_OPENSSL}
-                      -D BUILD_SHARED_LIBS=${LIBSRTP_SHARED_LIBS}
-                      -D OPENSSL_ROOT_DIR=${OPEN_SRC_INSTALL_PREFIX}
-                      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    CMAKE_ARGS        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+                      -DCMAKE_INSTALL_PREFIX:STRING=${OPEN_SRC_INSTALL_PREFIX}
+                      -DENABLE_OPENSSL=${LIBSRTP_ENABLE_OPENSSL}
+                      -DBUILD_SHARED_LIBS=${LIBSRTP_SHARED_LIBS}
+                      -DOPENSSL_ROOT_DIR=${OPEN_SRC_INSTALL_PREFIX}
     CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
     TEST_COMMAND      ""
 )
@@ -3,6 +3,7 @@ function(build_dependency lib_name)
   set(supported_libs
       gperftools
       gtest
+      awscpp
       benchmark
       jsmn
       openssl
@@ -26,6 +27,8 @@ function(build_dependency lib_name)
     set(lib_file_name srtp2)
   elseif(${lib_name} STREQUAL "gperftools")
     set(lib_file_name profiler)
+  elseif(${lib_name} STREQUAL "awscpp")
+    set(lib_file_name aws-cpp-sdk-core)
   endif()
   set(library_found NOTFOUND)
   find_library(