075-ssl-enable-usage-of-patched-mbed-functions-condition.patch (1843B)
1 From 01796db0b166e720860eff200acabff410ba6979 Mon Sep 17 00:00:00 2001 2 From: Hauke Mehrtens <hauke@hauke-m.de> 3 Date: Sun, 4 Dec 2016 00:15:21 +0100 4 Subject: [PATCH 4/7] ssl: enable usage of patched mbed functions conditionally 5 6 Only activate support for the MBEDTLS_KEY_EXCHANGE_ECDH_ANON_ENABLED 7 cipher suite when this is actually available in mbedtls. 8 This makes it possible to compile IoTivity against a unpatched mbedtls 9 version. 10 11 Change-Id: Ic56d7faf7597cc5dc08f9d55be29dde898949609 12 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 13 --- 14 resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 4 ++++ 15 1 file changed, 4 insertions(+) 16 17 --- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c 18 +++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c 19 @@ -237,7 +237,9 @@ int tlsCipher[ADAPTER_CIPHER_MAX][2] = 20 { 21 {MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA, 0}, 22 {MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8, 0}, 23 +#ifdef MBEDTLS_TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256 24 {MBEDTLS_TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256, 0}, 25 +#endif 26 {MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256, 0}, 27 {MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM, 0}, 28 {MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, 0} 29 @@ -1943,6 +1945,7 @@ CAResult_t CAsetTlsCipherSuite(const uin 30 g_caSslContext->cipher = ADAPTER_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8; 31 break; 32 } 33 +#ifdef MBEDTLS_TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256 34 case MBEDTLS_TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256: 35 { 36 #ifdef __WITH_TLS__ 37 @@ -1960,6 +1963,7 @@ CAResult_t CAsetTlsCipherSuite(const uin 38 g_caSslContext->cipher = ADAPTER_TLS_ECDH_ANON_WITH_AES_128_CBC_SHA_256; 39 break; 40 } 41 +#endif 42 case MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256: 43 { 44 #if 0 // PIN OTM