Merge branch 'master' into cache

ConnectivityFoundry · Dec 22, 2016 · 8580cdc · 8580cdc
2 parents 5ba1c2d + 460ab26
commit 8580cdc
Show file tree

Hide file tree

Showing 8 changed files with 619 additions and 97 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,7 @@ option (WITH_ERBIUM "Enable Erbium CoAP support)" ON)
 option (WITH_GNUTLS "Enable GnuTLS DTLS support" OFF)
 option (WITH_CYASSL "Enable CyaSSL DTLS support" OFF)
 option (WITH_TINYDTLS "Enable TinyDTLS DTLS support" OFF)
+option (WITH_MBEDTLS "Enable mbedTLS DTLS support" OFF)
 option (WITH_SYSTEMD "Install systemd service files" OFF)
 
 if (WITH_LIBCOAP)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -8,3 +8,4 @@ Rory Latchem <rory.latchem@imgtec.com>
 Delme Thomas
 Surender Sanke
 Janibasha Shaik
+François Berder <francois.berder@imgtec.com>
diff --git a/core/src/bootstrap/lwm2m_bootstrap_cert.h b/core/src/bootstrap/lwm2m_bootstrap_cert.h
@@ -116,7 +116,7 @@ const unsigned char bootsrapCert[] = {
  0x78, 0x71, 0x6E, 0x4D, 0x77, 0x30, 0x4E, 0x53, 0x36, 0x73, 0x51, 0x39, 0x67, 0x43, 0x47, 0x4C,
  0x48, 0x6E, 0x30, 0x35, 0x53, 0x7A, 0x6D, 0x6A, 0x4E, 0x4E, 0x72, 0x6F, 0x67, 0x0D, 0x0A, 0x2D,
  0x2D, 0x2D, 0x2D, 0x2D, 0x45, 0x4E, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43,
- 0x41, 0x54, 0x45, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x0D, 0x0A,
+ 0x41, 0x54, 0x45, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x0D, 0x0A, 0x00
 };
 
 #ifdef __cplusplus

diff --git a/core/src/common/CMakeLists.txt b/core/src/common/CMakeLists.txt
@@ -33,8 +33,11 @@ if (WITH_TINYDTLS)
   list (APPEND awa_common_SOURCES dtls_abstraction_tinydtls.c)
 endif ()
 
+if (WITH_MBEDTLS)
+  list (APPEND awa_common_SOURCES dtls_abstraction_mbedTLS.c)
+endif ()
 
-if (NOT WITH_GNUTLS AND NOT WITH_CYASSL AND NOT WITH_TINYDTLS)
+if (NOT WITH_GNUTLS AND NOT WITH_CYASSL AND NOT WITH_TINYDTLS AND NOT WITH_MBEDTLS)
   list (APPEND awa_common_SOURCES dtls_abstraction_dummy.c)
 endif ()
 
@@ -94,6 +97,10 @@ if (WITH_TINYDTLS)
   list (APPEND awa_common_LIBS tinydtls_static)
 endif ()
 
+if (WITH_MBEDTLS)
+  list (APPEND awa_common_LIBS mbedx509 mbedcrypto mbedtls)
+endif ()
+
 if (ENABLE_GCOV)
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")