Ci test run

.github/workflows/android.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Configure CMake
       working-directory: ${{github.workspace}}/build
       shell: bash
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a
+      run: cmake $GITHUB_WORKSPACE -DCRYPTO_LIBRARY=internal -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a
 
     - name: Build
       working-directory: ${{github.workspace}}/build
@@ -36,7 +36,7 @@ jobs:
     - name: Configure CMake (Shared Library)
       working-directory: ${{github.workspace}}/build_shared
       shell: bash
-      run: cmake $GITHUB_WORKSPACE -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a
+      run: cmake $GITHUB_WORKSPACE -DCRYPTO_LIBRARY=internal -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a
 
     - name: Build (Shared Library)
       working-directory: ${{github.workspace}}/build_shared

.github/workflows/autotools.yml

@@ -1,6 +1,7 @@
 name: AutoTools CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ main ]
   pull_request:
@@ -15,13 +16,13 @@ jobs:
         crypto: [internal, openssl, wolfssl, nss]
         include:
           - crypto: internal
-            configure-crypto-enable: ""
+            configure-crypto-enable: "--with-crypto-library=internal"
           - crypto: openssl
-            configure-crypto-enable: "--enable-openssl"
+            configure-crypto-enable: "--with-crypto-library=openssl"
           - crypto: wolfssl
-            configure-crypto-enable: "--enable-wolfssl"
+            configure-crypto-enable: "--with-crypto-library=wolfssl"
           - crypto: nss
-            configure-crypto-enable: "--enable-nss"
+            configure-crypto-enable: "--with-crypto-library=nss"
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/cifuzz.yml

@@ -23,7 +23,7 @@ jobs:
         fuzz-seconds: 300
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/cmake.yml

@@ -30,17 +30,17 @@ jobs:
             crypto: openssl3
         include:
           - crypto: internal
-            cmake-crypto-enable: ""
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=internal"
           - crypto: openssl
-            cmake-crypto-enable: "-DENABLE_OPENSSL=ON"
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=openssl"
           - crypto: openssl3
-            cmake-crypto-enable: "-DENABLE_OPENSSL=ON"
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=openssl"
           - crypto: wolfssl
-            cmake-crypto-enable: "-DENABLE_WOLFSSL=ON"
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=wolfssl"
           - crypto: nss
-            cmake-crypto-enable: "-DENABLE_NSS=ON"
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=nss"
           - crypto: mbedtls
-            cmake-crypto-enable: "-DENABLE_MBEDTLS=ON"
+            cmake-crypto-enable: "-DCRYPTO_LIBRARY=mbedtls"
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/cmake_release.yml

@@ -0,0 +1,48 @@
+name: CMake Release CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '20 4 * * 1'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        lib_type: [static, shared]
+        include:
+          - lib_type: static
+            cmake-lib-type: "-DBUILD_SHARED_LIBS=Off"
+          - lib_type: shared
+            cmake-lib-type: "-DBUILD_SHARED_LIBS=On"
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CTEST_OUTPUT_ON_FAILURE: 1
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: cmake $GITHUB_WORKSPACE -DLIBSRTP_TEST_APPS=OFF ${{matrix.cmake-lib-type}}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: cmake --build . --config Release
+
+    - name: Install
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: cmake --install . --prefix ${{github.workspace}}/install --config Release

.github/workflows/meson.yml

@@ -30,7 +30,7 @@ jobs:
             crypto: openssl3
         include:
           - crypto: internal
-            meson-crypto-enable: ""
+            meson-crypto-enable: "-Dcrypto-library=internal"
           - crypto: openssl
             meson-crypto-enable: "-Dcrypto-library=openssl"
           - crypto: openssl3
@@ -126,12 +126,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Create Build Environment
-      run: meson setup ${{github.workspace}}/build
-
-    - name: Configure Meson
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      run: ${{ env.pkgconfig-crypto-dir }} meson configure ${{ matrix.meson-crypto-enable }}
+      run: meson setup ${{github.workspace}}/build ${{ matrix.meson-crypto-enable }}
 
     - name: Build
       working-directory: ${{github.workspace}}/build

.github/workflows/stream_list.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Configure CMake
       working-directory: ${{github.workspace}}/build
       shell: bash
-      run: cmake $GITHUB_WORKSPACE -DLIBSRTP_TEST_APPS=ON -DCMAKE_C_FLAGS:STRING="-DSRTP_NO_STREAM_LIST -DSRTP_USE_TEST_STREAM_LIST"
+      run: cmake $GITHUB_WORKSPACE -DCRYPTO_LIBRARY=internal -DLIBSRTP_TEST_APPS=ON -DCMAKE_C_FLAGS:STRING="-DSRTP_NO_STREAM_LIST -DSRTP_USE_TEST_STREAM_LIST"
 
     - name: Build
       working-directory: ${{github.workspace}}/build

.gitignore

@@ -23,7 +23,7 @@ old?
 *.app
 
 # srtp things
-build
+build*/
 Debug
 Makefile
 Root

CMakeLists.txt

@@ -85,49 +85,42 @@ endif()
 set(ENABLE_DEBUG_LOGGING OFF CACHE BOOL "Enable debug logging in all modules")
 set(ERR_REPORTING_STDOUT OFF CACHE BOOL "Enable logging to stdout")
 set(ERR_REPORTING_FILE "" CACHE FILEPATH "Use file for logging")
-set(ENABLE_OPENSSL OFF CACHE BOOL "Enable OpenSSL crypto engine")
-set(ENABLE_WOLFSSL OFF CACHE BOOL "Enable wolfSSL crypto engine")
-set(ENABLE_MBEDTLS OFF CACHE BOOL "Enable MbedTLS crypto engine")
-set(ENABLE_NSS OFF CACHE BOOL "Enable NSS crypto engine")
 
-if(ENABLE_OPENSSL OR ENABLE_WOLFSSL OR ENABLE_MBEDTLS OR ENABLE_NSS)
-  set(USE_EXTERNAL_CRYPTO TRUE)
-else()
-  set(USE_EXTERNAL_CRYPTO FALSE)
+set(CRYPTO_LIBRARY_VALUES "openssl;wolfssl;mbedtls;nss;internal")
+set(CRYPTO_LIBRARY "openssl" CACHE STRING
+  "Crypto library used by libSRTP, can be one of: ${CRYPTO_LIBRARY_VALUES}")
+set_property(CACHE CRYPTO_LIBRARY PROPERTY STRINGS ${CRYPTO_LIBRARY_VALUES})
+if(NOT CRYPTO_LIBRARY IN_LIST CRYPTO_LIBRARY_VALUES)
+  message(FATAL_ERROR "Invalid value for CRYPTO_LIBRARY: ${CRYPTO_LIBRARY}. Allowed values are: ${CRYPTO_LIBRARY_VALUES}")
 endif()
+message(STATUS "Using crypto library: ${CRYPTO_LIBRARY}")
 
-if(ENABLE_OPENSSL)
-  if(ENABLE_WOLFSSL OR ENABLE_NSS OR ENABLE_MBEDTLS)
-    message(FATAL_ERROR "ssl conflict. can not enable openssl and wolfssl, mbedtls or nss simultaneously.")
-  endif()
-  find_package(OpenSSL 1.1.0 REQUIRED)
+set(USE_EXTERNAL_CRYPTO TRUE)
+set(ENABLE_OPENSSL FALSE)
+set(ENABLE_WOLFSSL FALSE)
+set(ENABLE_MBEDTLS FALSE)
+set(ENABLE_NSS FALSE)
+
+if(CRYPTO_LIBRARY STREQUAL "internal")
+  set(USE_EXTERNAL_CRYPTO FALSE)
+elseif(CRYPTO_LIBRARY STREQUAL "openssl")
+  set(ENABLE_OPENSSL TRUE)
+  find_package(OpenSSL REQUIRED)
   set(OPENSSL ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
   set(GCM ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
-endif()
-
-if(ENABLE_WOLFSSL)
-  if(ENABLE_OPENSSL OR ENABLE_NSS OR ENABLE_MBEDTLS)
-    message(FATAL_ERROR "ssl conflict. can not enable wolfssl and openssl, mbedtls or nss simultaneously.")
-  endif()
+elseif(CRYPTO_LIBRARY STREQUAL "wolfssl")
+  set(ENABLE_WOLFSSL TRUE)
   find_package(wolfSSL REQUIRED)
   set(WOLFSSL ${ENABLE_WOLFSSL} CACHE BOOL INTERNAL)
   set(WOLFSSL_KDF ${ENABLE_WOLFSSL} CACHE BOOL INTERNAL)
   set(GCM ${ENABLE_WOLFSSL} CACHE BOOL INTERNAL)
-endif()
-
-if(ENABLE_MBEDTLS)
-  if(ENABLE_OPENSSL OR ENABLE_WOLFSSL OR ENABLE_NSS)
-    message(FATAL_ERROR "ssl conflict. can not enable mbedtls and openssl, wolfssl or nss simultaneously.")
-  endif()
+elseif(CRYPTO_LIBRARY STREQUAL "mbedtls")
+  set(ENABLE_MBEDTLS TRUE)
   find_package(MbedTLS REQUIRED)
   set(MBEDTLS ${ENABLE_MBEDTLS} CACHE BOOL INTERNAL)
   set(GCM ${ENABLE_MBEDTLS} CACHE BOOL INTERNAL)
-endif()
-
-if(ENABLE_NSS)
-  if(ENABLE_OPENSSL OR ENABLE_WOLFSSL OR ENABLE_MBEDTLS)
-    message(FATAL_ERROR "ssl conflict. can not enable nss and openssl, wolfssl or mbedtls simultaneously.")
-  endif()
+elseif(CRYPTO_LIBRARY STREQUAL "nss")
+  set(ENABLE_NSS TRUE)
   find_package(NSS REQUIRED)
   set(NSS ${ENABLE_NSS} CACHE BOOL INTERNAL)
   set(GCM ${ENABLE_NSS} CACHE BOOL INTERNAL)
@@ -324,7 +317,7 @@ if(WIN32)
   target_compile_definitions(srtp3 PUBLIC _CRT_SECURE_NO_WARNINGS)
 endif()
 
-install(TARGETS srtp3 DESTINATION lib
+install(TARGETS srtp3
   EXPORT libSRTPTargets
 )
 

config_in.h

@@ -45,9 +45,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
 /* Define to 1 if you have the `nspr4' library (-lnspr4). */
 #undef HAVE_LIBNSPR4
 
@@ -57,9 +54,6 @@
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
 /* Define to 1 if you have the <machine/types.h> header file. */
 #undef HAVE_MACHINE_TYPES_H