From 84a8188c7d02881a46dc1f682e046463fed74c14 Mon Sep 17 00:00:00 2001 From: Dmitrii Zhuravlev Date: Tue, 22 Sep 2015 16:18:32 +0300 Subject: [PATCH] Disable checking parameters for non symmetric key Disables the second device and key length checking, in the case of credential provisioning based on the types that are different from SYMMETRIC_PAIR_WISE_KEY. Change-Id: I8dc8581e7af7ef104e7e2dd473c53d60acc1c9d9 Signed-off-by: Dmitrii Zhuravlev Reviewed-on: https://gerrit.iotivity.org/gerrit/2931 Tested-by: jenkins-iotivity Reviewed-by: Sachin Agrawal --- resource/csdk/security/provisioning/src/secureresourceprovider.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c index d2157ec..5b61d65 100644 --- a/resource/csdk/security/provisioning/src/secureresourceprovider.c +++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c @@ -618,10 +618,14 @@ OCStackResult SRPProvisionCredentials(void *ctx, OicSecCredType_t type, size_t k OCProvisionResultCB resultCallback) { VERIFY_NON_NULL(TAG, pDev1, ERROR, OC_STACK_INVALID_PARAM); - VERIFY_NON_NULL(TAG, pDev2, ERROR, OC_STACK_INVALID_PARAM); + if (SYMMETRIC_PAIR_WISE_KEY == type) + { + VERIFY_NON_NULL(TAG, pDev2, ERROR, OC_STACK_INVALID_PARAM); + } VERIFY_NON_NULL(TAG, resultCallback, ERROR, OC_STACK_INVALID_CALLBACK); - if (!(keySize == OWNER_PSK_LENGTH_128 || keySize == OWNER_PSK_LENGTH_256)) + if (SYMMETRIC_PAIR_WISE_KEY == type && + !(OWNER_PSK_LENGTH_128 == keySize || OWNER_PSK_LENGTH_256 == keySize)) { OC_LOG(INFO, TAG, "Invalid key size"); return OC_STACK_INVALID_PARAM; -- 2.7.4