From c38249186ff2d9139be14f75bde29d53b15e8ffd Mon Sep 17 00:00:00 2001 From: Chul Lee Date: Tue, 15 Nov 2016 10:32:26 +0900 Subject: [PATCH] Enable mbedTLS's log with LOGGING=1 option Change-Id: I51b285aac780d17d5ff45a6e5be200bef4359602 Signed-off-by: Chul Lee Reviewed-on: https://gerrit.iotivity.org/gerrit/14311 Tested-by: jenkins-iotivity Reviewed-by: Dmitriy Zhuravlev Reviewed-by: Uze Choi Reviewed-by: Randeep Singh (cherry picked from commit a682f6f440066ab1656b7704dca486684d64eaa4) Reviewed-on: https://gerrit.iotivity.org/gerrit/14437 --- resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c index 2e786eb..85ce49c 100644 --- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c +++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c @@ -42,7 +42,7 @@ #include "mbedtls/ssl_cookie.h" #endif -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(TB_LOG) #include "mbedtls/debug.h" #include "mbedtls/version.h" #endif @@ -288,7 +288,7 @@ static int GetAlertCode(uint32_t flags) return 0; } -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(TB_LOG) /** * Pass a message to the OIC logger. * @@ -1213,7 +1213,7 @@ static int InitConfig(mbedtls_ssl_config * conf, int transport, int mode) mbedtls_ssl_conf_renegotiation(conf, MBEDTLS_SSL_RENEGOTIATION_DISABLED); mbedtls_ssl_conf_authmode(conf, MBEDTLS_SSL_VERIFY_REQUIRED); -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(TB_LOG) mbedtls_ssl_conf_dbg(conf, DebugSsl, NULL); mbedtls_debug_set_threshold(MBED_TLS_DEBUG_LEVEL); #endif @@ -1311,7 +1311,7 @@ CAResult_t CAinitSslAdapter() /* Initialize TLS library */ -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(TB_LOG) char version[MBED_TLS_VERSION_LEN]; mbedtls_version_get_string(version); OIC_LOG_V(INFO, NET_SSL_TAG, "mbed TLS version: %s", version); -- 2.7.4