Mbedtls support

.travis.yml

@@ -114,6 +114,24 @@ matrix:
         - meson compile -C builddir
         - meson test -v -C builddir
 
+    # linux build with mbedtls
+    - os: linux
+      env:
+        - TEST="linux mbedtls (gcc)"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-6
+            - libmbedtls-dev
+      script:
+        - mkdir build && cd build
+        - cmake -DENABLE_MBEDTLS=ON ..
+        - make
+        - make test
+        - cd ..
+
     # default osx build
     - os: osx
       env:

CMakeLists.txt

@@ -4,7 +4,7 @@ project(libsrtp2 LANGUAGES C)
 
 set(PACKAGE_VERSION 2.4.0)
 set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${PACKAGE_VERSION}")
-
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_MODULE_PATH}")
 include(TestBigEndian)
 include(CheckIncludeFile)
 include(CheckFunctionExists)
@@ -54,15 +54,27 @@ 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_MBEDTLS OFF CACHE BOOL "Enable MbedTLS crypto engine")
 set(TEST_APPS ON CACHE BOOL "Build test applications")
 option(BUILD_SHARED_LIBS "Build shared library" OFF)
 
+if(ENABLE_OPENSSL AND ENABLE_MBEDTLS)
+  message(FATAL_ERROR "ssl conflict. can not enable openssl and mbedtls simultaneously.")
+endif()
+
 if(ENABLE_OPENSSL)
   find_package(OpenSSL REQUIRED)
   include_directories(${OPENSSL_INCLUDE_DIR})
+  set(OPENSSL ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
+  set(GCM ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
+endif()
+
+if(ENABLE_MBEDTLS)
+  find_package(MbedTLS REQUIRED)
+  include_directories(${MBEDTLS_INCLUDE_DIRS})
+  set(MBEDTLS ${ENABLE_MBEDTLS} CACHE BOOL INTERNAL)
+  set(GCM ${ENABLE_MBEDTLS} CACHE BOOL INTERNAL)
 endif()
-set(OPENSSL ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
-set(GCM ${ENABLE_OPENSSL} CACHE BOOL INTERNAL)
 
 set(CONFIG_FILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CONFIG_FILE_DIR})
@@ -85,6 +97,11 @@ if(ENABLE_OPENSSL)
     crypto/cipher/aes_icm_ossl.c
     crypto/cipher/aes_gcm_ossl.c
   )
+elseif(ENABLE_MBEDTLS)
+  list(APPEND CIPHERS_SOURCES_C
+    crypto/cipher/aes_icm_mbedtls.c
+    crypto/cipher/aes_gcm_mbedtls.c
+  )
 else()
   list(APPEND  CIPHERS_SOURCES_C
     crypto/cipher/aes.c
@@ -101,6 +118,10 @@ if(ENABLE_OPENSSL)
   list(APPEND HASHES_SOURCES_C
     crypto/hash/hmac_ossl.c
   )
+elseif(ENABLE_MBEDTLS)
+  list(APPEND HASHES_SOURCES_C
+    crypto/hash/hmac_mbedtls.c
+  )
 else()
   list(APPEND  HASHES_SOURCES_C
     crypto/hash/hmac.c
@@ -182,6 +203,9 @@ target_include_directories(srtp2 PUBLIC crypto/include include)
 if(ENABLE_OPENSSL)
   target_link_libraries(srtp2 OpenSSL::Crypto)
 endif()
+if(ENABLE_MBEDTLS)
+  target_link_libraries(srtp2 ${MBEDTLS_LIBRARIES})
+endif()
 if(WIN32)
   target_link_libraries(srtp2 ws2_32)
   target_compile_definitions(srtp2 PUBLIC _CRT_SECURE_NO_WARNINGS)

FindMbedTLS.cmake

@@ -0,0 +1,38 @@
+find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
+
+find_library(MBEDTLS_LIBRARY mbedtls)
+find_library(MBEDX509_LIBRARY mbedx509)
+find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
+
+set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MbedTLS DEFAULT_MSG
+    MBEDTLS_LIBRARY MBEDTLS_INCLUDE_DIRS MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+
+mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+
+if(NOT TARGET MbedTLS)
+	message("in mbedtls ${MBEDTLS_LIBRARY}")
+    add_library(MbedTLS UNKNOWN IMPORTED)
+    set_target_properties(MbedTLS PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIRS}"
+                          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                          IMPORTED_LOCATION "${MBEDTLS_LIBRARY}")
+endif()
+
+if(NOT TARGET MbedCrypto)
+    add_library(MbedCrypto UNKNOWN IMPORTED)
+    set_target_properties(MbedCrypto PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIRS}"
+                          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                          IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}")
+endif()
+
+if(NOT TARGET MbedX509)
+    add_library(MbedX509 UNKNOWN IMPORTED)
+    set_target_properties(MbedX509 PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIRS}"
+                          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                          IMPORTED_LOCATION "${MBEDX509_LIBRARY}")
+endif()

config_in_cmake.h

@@ -18,9 +18,13 @@
 /* Define this to use OpenSSL crypto. */
 #cmakedefine OPENSSL 1
 
+/* Define this to use MBEDTLS. */
+#cmakedefine MBEDTLS 1
+
 /* Define this to use AES-GCM. */
 #cmakedefine GCM 1
 
+
 /* Define if building for a CISC machine (e.g. Intel). */
 #define CPU_CISC 1