From 0af9ea538ef510a53eb79f4712a6cc6aa6b700ae Mon Sep 17 00:00:00 2001 From: leechul Date: Fri, 11 Dec 2015 10:41:03 +0900 Subject: [PATCH] Modify incorrect conditional statements in OCParseSecurityPayload Since, payload format changed as follows : [ { rep: security payload } ] to {security payload} We don't need check whether cbor value is a map. Change-Id: I65912c4bacd9e33cee991d5ba37c8ae1b01d0f1d Signed-off-by: leechul Reviewed-on: https://gerrit.iotivity.org/gerrit/4511 Tested-by: jenkins-iotivity Reviewed-by: dongik Lee Reviewed-by: Sachin Agrawal (cherry picked from commit b663056e39e228bc1f6dbaad6d5d7335fccde6a0) Reviewed-on: https://gerrit.iotivity.org/gerrit/4519 Reviewed-by: Habib Virji --- resource/csdk/stack/src/ocpayloadparse.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/resource/csdk/stack/src/ocpayloadparse.c b/resource/csdk/stack/src/ocpayloadparse.c index ce429f5..0ddb628 100644 --- a/resource/csdk/stack/src/ocpayloadparse.c +++ b/resource/csdk/stack/src/ocpayloadparse.c @@ -113,19 +113,10 @@ static OCStackResult OCParseSecurityPayload(OCPayload** outPayload, CborValue* r bool err = false; char * securityData = NULL; CborValue map; - err = err || cbor_value_enter_container(rootValue, &map); - - if(cbor_value_is_map(&map)) - { - size_t len; - err = err || cbor_value_dup_text_string(&map, &securityData, &len, NULL); - } - else - { - OC_LOG(ERROR, TAG, "Cbor main value not a map"); - return OC_STACK_MALFORMED_RESPONSE; - } + size_t len; + err = err || cbor_value_enter_container(rootValue, &map); + err = err || cbor_value_dup_text_string(&map, &securityData, &len, NULL); err = err || cbor_value_leave_container(rootValue, &map); if(err) -- 2.7.4