security: Conditionnal include of mbedtls

Change-Id: I13155cbd4425421c340db74e60c367a76d529cec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17473
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c
index 5b82ad6..3de8981 100644 (file)
--- a/resource/csdk/security/src/directpairing.c
+++ b/resource/csdk/security/src/directpairing.c
@@ -51,7 +51,9 @@
 #include "pmtypes.h"
 #include "pmutility.h"
 #include "srmutility.h"
-#include "mbedtls/ssl_ciphersuites.h"
+#if defined(__WITH_DTLS__) || defined (__WITH_TLS__)
+#include <mbedtls/ssl_ciphersuites.h>
+#endif
 
 #define TAG ("OIC_DP")
 static const uint16_t CBOR_SIZE = 1024;

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 7faf347..e0f339a 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -49,10 +49,9 @@
 #include "srmutility.h"
 #include "pinoxmcommon.h"
 #include "oxmverifycommon.h"
-#include "mbedtls/ssl_ciphersuites.h"
-
 #if defined(__WITH_DTLS__) || defined (__WITH_TLS__)
-#include "mbedtls/md.h"
+#include <mbedtls/ssl_ciphersuites.h>
+#include <mbedtls/md.h>
 #include "pkix_interface.h"
 #endif
 

diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c
index dcb7643..ada1de3 100644 (file)
--- a/resource/csdk/security/src/dpairingresource.c
+++ b/resource/csdk/security/src/dpairingresource.c
@@ -41,7 +41,9 @@
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
 #include "payload_logging.h"
-#include "mbedtls/ssl_ciphersuites.h"
+#if defined(__WITH_DTLS__) || defined (__WITH_TLS__)
+#include <mbedtls/ssl_ciphersuites.h>
+#endif
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>