From e133089b764270a24861c7241e3df956df6a74ff Mon Sep 17 00:00:00 2001 From: Dmitriy Zhuravlev Date: Thu, 13 Apr 2017 18:10:56 +0300 Subject: [PATCH] [IOT-2045] Fix PIN based OTM OTM should be able to use PSK ciphersuite even if there is no credentials in SVR DB Change-Id: Icfde495b61f5f726cab2604fd5fc0f5e9e88fff9 Signed-off-by: Dmitriy Zhuravlev Reviewed-on: https://gerrit.iotivity.org/gerrit/18929 Tested-by: jenkins-iotivity Reviewed-by: Greg Zaverucha --- resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 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 f753140..88cb418 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 @@ -1330,8 +1330,9 @@ static void SetupCipher(mbedtls_ssl_config * config, CATransportAdapter_t adapte g_getCredentialTypesCallback(g_caSslContext->cipherFlag, deviceId); - // Retrieve the PSK credential from SRM - if (true == g_caSslContext->cipherFlag[0] && 0 != InitPskIdentity(config)) + // Retrieve the PSK credential from SRM or use PIN based generation + if ((SSL_ECDHE_PSK_WITH_AES_128_CBC_SHA256 == g_caSslContext->cipher || + true == g_caSslContext->cipherFlag[0]) && 0 != InitPskIdentity(config)) { OIC_LOG(ERROR, NET_SSL_TAG, "PSK identity initialization failed!"); } -- 2.7.4