071-ssl-call-mbedtls_version_get_string-only-if-availabl.patch (1368B)
1 From cee085e0e62214603b9ae035d63fabca23c491bd Mon Sep 17 00:00:00 2001 2 From: Hauke Mehrtens <hauke@hauke-m.de> 3 Date: Sun, 8 Jan 2017 01:39:35 +0100 4 Subject: [PATCH 6/7] ssl: call mbedtls_version_get_string() only if available 5 6 The function mbedtls_version_get_string() is only available if 7 MBEDTLS_VERSION_C is set in the mbedtls configuration. Check this 8 before calling this function and print the mbedtls version this was 9 compiled against instead if mbedtls_version_get_string() is not 10 available. 11 12 This fixes a compile problem when MBEDTLS_VERSION_C is not set. 13 14 Change-Id: I54c2c2a3fc1f9d35afa475500e3db68420a1b54a 15 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 16 --- 17 resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 4 ++++ 18 1 file changed, 4 insertions(+) 19 20 --- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c 21 +++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c 22 @@ -1376,9 +1376,13 @@ CAResult_t CAinitSslAdapter() 23 /* Initialize TLS library 24 */ 25 #if !defined(NDEBUG) || defined(TB_LOG) 26 +#ifdef MBEDTLS_VERSION_C 27 char version[MBED_TLS_VERSION_LEN]; 28 mbedtls_version_get_string(version); 29 OIC_LOG_V(INFO, NET_SSL_TAG, "mbed TLS version: %s", version); 30 +#else 31 + OIC_LOG_V(INFO, NET_SSL_TAG, "mbed TLS version: %s", MBEDTLS_VERSION_STRING); 32 +#endif 33 #endif 34 35 /* Entropy settings