From 6a4a31b50aa2646183cca550baa4afc7f7253926 Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Thu, 10 Dec 2015 14:09:45 +0000 Subject: [PATCH] Change SECURITY payload in correct format. Updated code to correct format: [ { rep: security payload } ] to {security payload} Change-Id: I8ab414d762b34c75ccff6ac7698d564462636829 Signed-off-by: Habib Virji Reviewed-on: https://gerrit.iotivity.org/gerrit/4499 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/stack/src/ocpayloadconvert.c | 13 ++++--------- resource/csdk/stack/src/ocpayloadparse.c | 19 ++++++------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/resource/csdk/stack/src/ocpayloadconvert.c b/resource/csdk/stack/src/ocpayloadconvert.c index 861f70a..e5ae680 100644 --- a/resource/csdk/stack/src/ocpayloadconvert.c +++ b/resource/csdk/stack/src/ocpayloadconvert.c @@ -185,22 +185,17 @@ static int64_t OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* out cbor_encoder_init(&encoder, outPayload, *size, 0); - CborEncoder rootArray; - err = err | cbor_encoder_create_array(&encoder, &rootArray, 1); CborEncoder map; - err = err | cbor_encoder_create_map(&rootArray, &map, CborIndefiniteLength); + err = err | cbor_encoder_create_map(&encoder, &map, CborIndefiniteLength); if(payload->securityData) { - err = err | AddTextStringToMap(&map, OC_RSRVD_REPRESENTATION, - sizeof(OC_RSRVD_REPRESENTATION) - 1, - payload->securityData); + err = err | cbor_encode_text_string(&map, payload->securityData, + strlen(payload->securityData)); } - err = err | cbor_encoder_close_container(&rootArray, &map); - - err = err | cbor_encoder_close_container(&encoder, &rootArray); + err = err | cbor_encoder_close_container(&encoder, &map); return checkError(err, &encoder, outPayload, size); } diff --git a/resource/csdk/stack/src/ocpayloadparse.c b/resource/csdk/stack/src/ocpayloadparse.c index 05023ae..14fb921 100644 --- a/resource/csdk/stack/src/ocpayloadparse.c +++ b/resource/csdk/stack/src/ocpayloadparse.c @@ -112,19 +112,13 @@ static OCStackResult OCParseSecurityPayload(OCPayload** outPayload, CborValue* r bool err = false; char * securityData = NULL; - CborValue arrayVal; - err = err || cbor_value_enter_container(rootValue, &arrayVal); + CborValue map; + err = err || cbor_value_enter_container(rootValue, &map); - if(cbor_value_is_map(&arrayVal)) + if(cbor_value_is_map(&map)) { - CborValue curVal; - err = err || cbor_value_map_find_value(&arrayVal, OC_RSRVD_REPRESENTATION, &curVal); - - if(cbor_value_is_valid(&curVal)) - { - size_t len; - err = err || cbor_value_dup_text_string(&curVal, &securityData, &len, NULL); - } + size_t len; + err = err || cbor_value_dup_text_string(&map, &securityData, &len, NULL); } else { @@ -132,8 +126,7 @@ static OCStackResult OCParseSecurityPayload(OCPayload** outPayload, CborValue* r return OC_STACK_MALFORMED_RESPONSE; } - err = err || cbor_value_advance(&arrayVal); - err = err || cbor_value_leave_container(rootValue, &arrayVal); + err = err || cbor_value_leave_container(rootValue, &map); if(err) { -- 2.7.4