From 8957e2b3bb08cffae0ba3bb5bdbaa27fbeadfee2 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Mon, 6 Feb 2017 14:11:03 -0800 Subject: [PATCH] [IOT-1488] Remove workaround Remove workaround, now that change 82c4c656ea508d6014419b0f82c6b734e55118e5 is releasing the mutex, from the error code path. Change-Id: Ibfb5fad559d9351e3279d7af3346b49de8570738 Signed-off-by: Dan Mihai Reviewed-on: https://gerrit.iotivity.org/gerrit/17083 Tested-by: jenkins-iotivity Reviewed-by: Kevin Kane --- resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 6 ------ 1 file changed, 6 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 76f1239..45764f2 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 @@ -902,9 +902,6 @@ const CASecureEndpoint_t *GetCASecureEndpointData(const CAEndpoint_t* peer) { OIC_LOG_V(DEBUG, NET_SSL_TAG, "In %s", __func__); - // TODO: Added as workaround, need to debug - oc_mutex_unlock(g_sslContextMutex); - oc_mutex_lock(g_sslContextMutex); if (NULL == g_caSslContext) { @@ -2214,9 +2211,6 @@ CAResult_t CAsslGenerateOwnerPsk(const CAEndpoint_t *endpoint, VERIFY_NON_NULL_RET(provServerDeviceId, NET_SSL_TAG, "provId is NULL", CA_STATUS_INVALID_PARAM); VERIFY_NON_NULL_RET(ownerPsk, NET_SSL_TAG, "ownerPSK is NULL", CA_STATUS_INVALID_PARAM); - // TODO: Added as workaround, need to debug - oc_mutex_unlock(g_sslContextMutex); - oc_mutex_lock(g_sslContextMutex); if (NULL == g_caSslContext) { -- 2.7.4