Merge "[IOT-2696] Allow chain of certs in public data" into 1.3-rel

diff --cc resource/csdk/security/src/credresource.c
Simple merge

diff --cc resource/csdk/security/src/rolesresource.c
index 59eb81b,36c88bb..11e0db5
--- 1/resource/csdk/security/src/rolesresource.c
--- 2/resource/csdk/security/src/rolesresource.c
+++ b/resource/csdk/security/src/rolesresource.c
@@@ -720,15 -666,7 +691,10 @@@ OCStackResult CBORPayloadToRoles(const 
                              {
                                  cborFindResult = DeserializeEncodingFromCbor(&roleMap, &currEntry->certificate);
                                  VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to read publicData");
 +
 +                                /* mbedtls_x509_crt_parse requires null string terminator */
 +                                VERIFY_TRUE_OR_EXIT(TAG, AddNullTerminator(&currEntry->certificate), ERROR);
                              }
-                             else if (strcmp(tagName, OIC_JSON_OPTDATA_NAME) == 0)
-                             {
-                                 cborFindResult = DeserializeSecOptFromCbor(&roleMap, &currEntry->optData);
-                                 VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to read optionalData");
-                             }
                              else if (strcmp(tagName, OIC_JSON_CREDTYPE_NAME) == 0)
                              {
                                  uint64_t credType = 0;