X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fsrc%2Fcredresource.c;h=d4a7c613421d0d66d29beb9fb4c50a0b76e00d2f;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=4dc8699e6ab11846759d4f08557f0b9b45b8bd19;hpb=495ebf2780c41444fe332c4af44de20c7e826b44;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c index 4dc8699..d4a7c61 100644 --- a/resource/csdk/security/src/credresource.c +++ b/resource/csdk/security/src/credresource.c @@ -38,7 +38,9 @@ #include "base64.h" #include "ocserverrequest.h" #include "oic_malloc.h" +#include "oic_string.h" #include "ocpayload.h" +#include "ocpayloadcbor.h" #include "utlist.h" #include "credresource.h" #include "doxmresource.h" @@ -58,11 +60,7 @@ #include #endif -#ifdef __WITH_DTLS__ -#include "global.h" -#endif - -#define TAG "SRM-CREDL" +#define TAG "OIC_SRM_CREDL" /** Max credential types number used for TLS */ #define MAX_TYPE 2 @@ -71,16 +69,159 @@ static const uint16_t CBOR_SIZE = 2048; /** Max cbor size payload. */ -static const uint16_t CBOR_MAX_SIZE = 4400; +//static const uint16_t CBOR_MAX_SIZE = 4400; /** CRED size - Number of mandatory items. */ static const uint8_t CRED_ROOT_MAP_SIZE = 4; static const uint8_t CRED_MAP_SIZE = 3; - static OicSecCred_t *gCred = NULL; static OCResourceHandle gCredHandle = NULL; +#ifdef MULTIPLE_OWNER +#define PRECONF_PIN_MIN_SIZE (8) +#endif + +typedef enum CredCompareResult{ + CRED_CMP_EQUAL = 0, + CRED_CMP_NOT_EQUAL = 1, + CRED_CMP_ERROR = 2 +}CredCompareResult_t; + +/** + * Internal function to check a subject of SIGNED_ASYMMETRIC_KEY(Certificate). + * If that subject is NULL or wildcard, set it to own deviceID. + * @param cred credential on SVR DB file + * @param deviceID own deviceuuid of doxm resource + * + * @return + * true successfully done + * false Invalid cred + */ +static bool CheckSubjectOfCertificate(OicSecCred_t* cred, OicUuid_t deviceID) +{ + OicUuid_t emptyUuid = {.id={0}}; + OIC_LOG(DEBUG, TAG, "IN CheckSubjectOfCertificate"); + VERIFY_NON_NULL(TAG, cred, ERROR); + +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + if ( SIGNED_ASYMMETRIC_KEY == cred->credType) + { + if((0 == memcmp(cred->subject.id, emptyUuid.id, sizeof(cred->subject.id))) || + (0 == memcmp(cred->subject.id, &WILDCARD_SUBJECT_ID, sizeof(cred->subject.id)))) + { + memcpy(cred->subject.id, deviceID.id, sizeof(deviceID.id)); + } + } +#endif + + OIC_LOG(DEBUG, TAG, "OUT CheckSubjectOfCertificate"); + return true; +exit: + OIC_LOG(ERROR, TAG, "OUT CheckSubjectOfCertificate"); + return false; +} + +/** + * Internal function to check credential + */ +static bool IsValidCredential(const OicSecCred_t* cred) +{ + OicUuid_t emptyUuid = {.id={0}}; + + + OIC_LOG(INFO, TAG, "IN IsValidCredential"); + + VERIFY_NON_NULL(TAG, cred, ERROR); + VERIFY_SUCCESS(TAG, 0 != cred->credId, ERROR); + OIC_LOG_V(DEBUG, TAG, "Cred ID = %d", cred->credId); + +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + OIC_LOG_V(DEBUG, TAG, "Cred Type = %d", cred->credType); + + switch(cred->credType) + { + case SYMMETRIC_PAIR_WISE_KEY: + case SYMMETRIC_GROUP_KEY: + case PIN_PASSWORD: + { + VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR); + VERIFY_SUCCESS(TAG, 0 != cred->privateData.len, ERROR); + VERIFY_SUCCESS(TAG, \ + (OIC_ENCODING_RAW == cred->privateData.encoding || \ + OIC_ENCODING_BASE64 == cred->privateData.encoding), \ + ERROR); + break; + } + case ASYMMETRIC_KEY: + { + VERIFY_NON_NULL(TAG, cred->publicData.data, ERROR); + VERIFY_SUCCESS(TAG, 0 != cred->publicData.len, ERROR); + VERIFY_SUCCESS(TAG, \ + (OIC_ENCODING_UNKNOW < cred->publicData.encoding && \ + OIC_ENCODING_DER >= cred->publicData.encoding), + ERROR); + break; + } + case SIGNED_ASYMMETRIC_KEY: + { + VERIFY_SUCCESS(TAG, (NULL != cred->publicData.data ||NULL != cred->optionalData.data) , ERROR); + VERIFY_SUCCESS(TAG, (0 != cred->publicData.len || 0 != cred->optionalData.len), ERROR); + + if(NULL != cred->optionalData.data) + { + VERIFY_SUCCESS(TAG, \ + (OIC_ENCODING_UNKNOW < cred->optionalData.encoding && \ + OIC_ENCODING_DER >= cred->optionalData.encoding), + ERROR); + } + break; + } + case ASYMMETRIC_ENCRYPTION_KEY: + { + VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR); + VERIFY_SUCCESS(TAG, 0 != cred->privateData.len, ERROR); + VERIFY_SUCCESS(TAG, \ + (OIC_ENCODING_UNKNOW < cred->privateData.encoding && \ + OIC_ENCODING_DER >= cred->privateData.encoding), + ERROR); + break; + } + default: + { + OIC_LOG(WARNING, TAG, "Unknown credential type"); + return false; + } + } +#endif + + VERIFY_SUCCESS(TAG, 0 != memcmp(emptyUuid.id, cred->subject.id, sizeof(cred->subject.id)), ERROR); + + OIC_LOG(INFO, TAG, "OUT IsValidCredential : Credential are valid."); + return true; +exit: + OIC_LOG(WARNING, TAG, "OUT IsValidCredential : Invalid Credential detected."); + return false; +} + +static bool IsEmptyCred(const OicSecCred_t* cred) +{ + OicUuid_t emptyUuid = {.id={0}}; + + VERIFY_SUCCESS(TAG, (0 == memcmp(cred->subject.id, emptyUuid.id, sizeof(emptyUuid))), ERROR); + VERIFY_SUCCESS(TAG, (0 == cred->credId), ERROR); + VERIFY_SUCCESS(TAG, (0 == cred->credType), ERROR); +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + VERIFY_SUCCESS(TAG, (NULL == cred->privateData.data), ERROR); + VERIFY_SUCCESS(TAG, (NULL == cred->publicData.data), ERROR); + VERIFY_SUCCESS(TAG, (NULL == cred->optionalData.data), ERROR); + VERIFY_SUCCESS(TAG, (NULL == cred->credUsage), ERROR); +#endif + return true; +exit: + return false; +} + /** * This function frees OicSecCred_t object's fields and object itself. */ @@ -98,20 +239,26 @@ static void FreeCred(OicSecCred_t *cred) #endif //Clean PublicData/OptionalData/Credusage -#if defined(__WITH_X509__) || defined(__WITH_TLS__) +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) // TODO: Need to check credUsage. OICFree(cred->publicData.data); OICFree(cred->optionalData.data); OICFree(cred->credUsage); -#endif /* __WITH_X509__ || __WITH_TLS__*/ +#endif /* __WITH_DTLS__ || __WITH_TLS__*/ //Clean PrivateData + OICClearMemory(cred->privateData.data, cred->privateData.len); OICFree(cred->privateData.data); //Clean Period OICFree(cred->period); +#ifdef MULTIPLE_OWNER + //Clean eowner + OICFree(cred->eownerID); +#endif + //Clean Cred node itself OICFree(cred); } @@ -141,7 +288,7 @@ size_t GetCredKeyDataSize(const OicSecCred_t* cred) { size += credPtr->privateData.len; } -#if defined(__WITH_X509__) || defined(__WITH_TLS__) +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) if (credPtr->publicData.data && 0 < credPtr->publicData.len) { size += credPtr->publicData.len; @@ -153,7 +300,7 @@ size_t GetCredKeyDataSize(const OicSecCred_t* cred) #endif } } - OIC_LOG_V(DEBUG, TAG, "Cred Key Data Size : %d\n", size); + OIC_LOG_V(DEBUG, TAG, "Cred Key Data Size : %zd\n", size); return size; } @@ -167,6 +314,261 @@ static size_t OicSecCredCount(const OicSecCred_t *secCred) return size; } +static char* EncodingValueToString(OicEncodingType_t encoding) +{ + char* str = NULL; + switch (encoding) + { + case OIC_ENCODING_RAW: + str = (char*)OIC_SEC_ENCODING_RAW; + break; + case OIC_ENCODING_BASE64: + str = (char*)OIC_SEC_ENCODING_BASE64; + break; + case OIC_ENCODING_DER: + str = (char*)OIC_SEC_ENCODING_DER; + break; + case OIC_ENCODING_PEM: + str = (char*)OIC_SEC_ENCODING_PEM; + break; + default: + break; + } + return str; +} + +static CborError SerializeEncodingToCborInternal(CborEncoder *map, const OicSecKey_t *value) +{ + CborError cborEncoderResult = CborNoError; + char *encoding = EncodingValueToString(value->encoding); + if (encoding) + { + cborEncoderResult = cbor_encode_text_string(map, OIC_JSON_ENCODING_NAME, + strlen(OIC_JSON_ENCODING_NAME)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Encoding Tag."); + cborEncoderResult = cbor_encode_text_string(map, encoding, + strlen(encoding)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Encoding Value."); + + cborEncoderResult = cbor_encode_text_string(map, OIC_JSON_DATA_NAME, + strlen(OIC_JSON_DATA_NAME)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Name Tag."); + if (OIC_ENCODING_DER == value->encoding || + OIC_ENCODING_RAW == value->encoding) + { + cborEncoderResult = cbor_encode_byte_string(map, + value->data, value->len); + } + else + { + cborEncoderResult = cbor_encode_text_string(map, + (char*)value->data, value->len); + } + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Name Value."); + } + else + { + OIC_LOG(ERROR, TAG, "Unknown encoding type."); + VERIFY_CBOR_SUCCESS(TAG, CborErrorUnknownType, "Failed Adding Encoding Value."); + } + exit: + return cborEncoderResult; +} + +static CborError SerializeEncodingToCbor(CborEncoder *rootMap, const char* tag, const OicSecKey_t *value) +{ + CborError cborEncoderResult = CborNoError; + CborEncoder map; + const size_t mapSize = 2; + + cborEncoderResult = cbor_encode_text_string(rootMap, tag, strlen(tag)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PrivateData Tag."); + + cborEncoderResult = cbor_encoder_create_map(rootMap, &map, mapSize); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Map"); + + VERIFY_CBOR_SUCCESS(TAG, SerializeEncodingToCborInternal(&map, value), + "Failed adding OicSecKey_t structure"); + + cborEncoderResult = cbor_encoder_close_container(rootMap, &map); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing Map."); + + exit: + return cborEncoderResult; +} + +static CborError SerializeSecOptToCbor(CborEncoder *rootMap, const char* tag, const OicSecOpt_t *value) +{ + CborError cborEncoderResult = CborNoError; + CborEncoder map; + const size_t mapSize = 3; + + cborEncoderResult = cbor_encode_text_string(rootMap, tag, strlen(tag)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PrivateData Tag."); + + cborEncoderResult = cbor_encoder_create_map(rootMap, &map, mapSize); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Map"); + + OicSecKey_t in; + in.data = value->data; + in.encoding = value->encoding; + in.len = value->len; + + VERIFY_CBOR_SUCCESS(TAG, SerializeEncodingToCborInternal(&map, &in), + "Failed adding OicSecKey_t structure"); + + cborEncoderResult = cbor_encode_text_string(&map, OIC_JSON_REVOCATION_STATUS_NAME, + strlen(OIC_JSON_REVOCATION_STATUS_NAME)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional revstat Tag."); + cborEncoderResult = cbor_encode_boolean(&map, value->revstat); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional revstat Value."); + + cborEncoderResult = cbor_encoder_close_container(rootMap, &map); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing Map."); + + exit: + return cborEncoderResult; +} + +static CborError DeserializeEncodingFromCborInternal(CborValue *map, char *name, OicSecKey_t *value) +{ + size_t len = 0; + CborError cborFindResult = CborNoError; + + // data -- Mandatory + if (strcmp(name, OIC_JSON_DATA_NAME) == 0) + { + if(cbor_value_is_byte_string(map)) + { + cborFindResult = cbor_value_dup_byte_string(map, &value->data, + &value->len, NULL); + } + else if(cbor_value_is_text_string(map)) + { + cborFindResult = cbor_value_dup_text_string(map, (char**)(&value->data), + &value->len, NULL); + } + else + { + cborFindResult = CborErrorUnknownType; + OIC_LOG(ERROR, TAG, "Unknown type for private data."); + } + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding PrivateData."); + } + + // encoding -- Mandatory + if (strcmp(name, OIC_JSON_ENCODING_NAME) == 0) + { + char* strEncoding = NULL; + cborFindResult = cbor_value_dup_text_string(map, &strEncoding, &len, NULL); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding EncodingType"); + + if(strcmp(strEncoding, OIC_SEC_ENCODING_RAW) == 0) + { + value->encoding = OIC_ENCODING_RAW; + } + else if(strcmp(strEncoding, OIC_SEC_ENCODING_BASE64) == 0) + { + value->encoding = OIC_ENCODING_BASE64; + } + else if(strcmp(strEncoding, OIC_SEC_ENCODING_DER) == 0) + { + value->encoding = OIC_ENCODING_DER; + } + else if(strcmp(strEncoding, OIC_SEC_ENCODING_PEM) == 0) + { + value->encoding = OIC_ENCODING_PEM; + } + else + { + //For unit test + value->encoding = OIC_ENCODING_RAW; + OIC_LOG(WARNING, TAG, "Unknown encoding type detected."); + } + OICFree(strEncoding); + } + exit: + return cborFindResult; +} + +static CborError DeserializeEncodingFromCbor(CborValue *rootMap, OicSecKey_t *value) +{ + CborValue map = { .parser = NULL }; + CborError cborFindResult = cbor_value_enter_container(rootMap, &map); + size_t len = 0; + + while (cbor_value_is_valid(&map)) + { + char* name = NULL; + CborType type = cbor_value_get_type(&map); + if (type == CborTextStringType && cbor_value_is_text_string(&map)) + { + cborFindResult = cbor_value_dup_text_string(&map, &name, &len, NULL); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to get text"); + cborFindResult = cbor_value_advance(&map); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to advance value"); + } + if (name) + { + VERIFY_CBOR_SUCCESS(TAG, DeserializeEncodingFromCborInternal(&map, name, value), + "Failed to read OicSecKey_t value"); + } + if (cbor_value_is_valid(&map)) + { + cborFindResult = cbor_value_advance(&map); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing Map."); + } + OICFree(name); + } + exit: + return cborFindResult; +} + +static CborError DeserializeSecOptFromCbor(CborValue *rootMap, OicSecOpt_t *value) +{ + CborValue map = { .parser = NULL }; + CborError cborFindResult = cbor_value_enter_container(rootMap, &map); + size_t len = 0; + value->revstat = false; + + while (cbor_value_is_valid(&map)) + { + char* name = NULL; + CborType type = cbor_value_get_type(&map); + if (type == CborTextStringType && cbor_value_is_text_string(&map)) + { + cborFindResult = cbor_value_dup_text_string(&map, &name, &len, NULL); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to get text"); + cborFindResult = cbor_value_advance(&map); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to advance value"); + } + if (name) + { + // OptionalData::revstat -- Mandatory + if (strcmp(name, OIC_JSON_REVOCATION_STATUS_NAME) == 0) + { + cborFindResult = cbor_value_get_boolean(&map, &value->revstat); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding revstat Value.") + } + OicSecKey_t out; + VERIFY_CBOR_SUCCESS(TAG, DeserializeEncodingFromCborInternal(&map, name, &out), + "Failed to read OicSecKey_t value"); + + value->data = out.data; + value->encoding = out.encoding; + value->len = out.len; + } + if (cbor_value_is_valid(&map)) + { + cborFindResult = cbor_value_advance(&map); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing Map."); + } + OICFree(name); + } + exit: + return cborFindResult; +} + OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload, size_t *cborSize, int secureFlag) { @@ -218,7 +620,15 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload { mapSize++; } -#if defined(__WITH_X509__) || defined(__WITH_TLS__) + +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) +#ifdef MULTIPLE_OWNER + if(cred->eownerID) + { + mapSize++; + } +#endif //MULTIPLE_OWNER + if (SIGNED_ASYMMETRIC_KEY == cred->credType && cred->publicData.data) { mapSize++; @@ -231,7 +641,7 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload { mapSize++; } -#endif /* __WITH_X509__ || __WITH_TLS__*/ +#endif /* __WITH_DTLS__ || __WITH_TLS__*/ if (!secureFlag && cred->privateData.data) { mapSize++; @@ -250,7 +660,7 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload cborEncoderResult = cbor_encode_text_string(&credMap, OIC_JSON_SUBJECTID_NAME, strlen(OIC_JSON_SUBJECTID_NAME)); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Subject Tag."); - inLen = (memcmp(&(cred->subject), &WILDCARD_SUBJECT_ID, WILDCARD_SUBJECT_ID_LEN) == 0) ? + inLen = (memcmp(&(cred->subject), &WILDCARD_SUBJECT_ID, sizeof(OicUuid_t)) == 0) ? WILDCARD_SUBJECT_ID_LEN : sizeof(OicUuid_t); if(inLen == WILDCARD_SUBJECT_ID_LEN) { @@ -275,124 +685,20 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload cborEncoderResult = cbor_encode_int(&credMap, cred->credType); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Cred Type Value."); -#if defined(__WITH_X509__) || defined(__WITH_TLS__) +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) //PublicData -- Not Mandatory if (SIGNED_ASYMMETRIC_KEY == cred->credType && cred->publicData.data) { - CborEncoder publicMap; - const size_t publicMapSize = 2; - - cborEncoderResult = cbor_encode_text_string(&credMap, OIC_JSON_PUBLICDATA_NAME, - strlen(OIC_JSON_PUBLICDATA_NAME)); + cborEncoderResult = SerializeEncodingToCbor(&credMap, + OIC_JSON_PUBLICDATA_NAME, &cred->publicData); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PublicData Tag."); - - cborEncoderResult = cbor_encoder_create_map(&credMap, &publicMap, publicMapSize); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PublicData Map"); - - cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Pub Data Tag."); - cborEncoderResult = cbor_encode_byte_string(&publicMap, cred->publicData.data, - cred->publicData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Pub Value."); - - // TODO: Need to data strucure modification for OicSecCert_t. - cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Public Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_SEC_ENCODING_DER, - strlen(OIC_SEC_ENCODING_DER)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Public Encoding Value."); - - cborEncoderResult = cbor_encoder_close_container(&credMap, &publicMap); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing PublicData Map."); } //OptionalData -- Not Mandatory if (SIGNED_ASYMMETRIC_KEY == cred->credType && cred->optionalData.data) { - CborEncoder optionalMap; - const size_t optionalMapSize = 2; - - cborEncoderResult = cbor_encode_text_string(&credMap, OIC_JSON_OPTDATA_NAME, - strlen(OIC_JSON_OPTDATA_NAME)); + cborEncoderResult = SerializeSecOptToCbor(&credMap, + OIC_JSON_OPTDATA_NAME, &cred->optionalData); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding OptionalData Tag."); - - cborEncoderResult = cbor_encoder_create_map(&credMap, &optionalMap, optionalMapSize); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding OptionalData Map"); - - // TODO: Need to data strucure modification for OicSecCert_t. - if(OIC_ENCODING_RAW == cred->optionalData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_SEC_ENCODING_RAW, - strlen(OIC_SEC_ENCODING_RAW)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Tag."); - cborEncoderResult = cbor_encode_byte_string(&optionalMap, cred->optionalData.data, - cred->optionalData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Value."); - } - else if(OIC_ENCODING_BASE64 == cred->optionalData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_SEC_ENCODING_BASE64, - strlen(OIC_SEC_ENCODING_BASE64)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, (char*)(cred->optionalData.data), - cred->optionalData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Value."); - } - else if(OIC_ENCODING_PEM == cred->optionalData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_SEC_ENCODING_PEM, - strlen(OIC_SEC_ENCODING_PEM)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, (char*)(cred->optionalData.data), - cred->optionalData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Value."); - } - else if(OIC_ENCODING_DER == cred->optionalData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_SEC_ENCODING_DER, - strlen(OIC_SEC_ENCODING_DER)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&optionalMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Tag."); - cborEncoderResult = cbor_encode_byte_string(&optionalMap, cred->optionalData.data, - cred->optionalData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding optional Value."); - } - else - { - OIC_LOG(ERROR, TAG, "Unknow encoding type for optional data."); - VERIFY_CBOR_SUCCESS(TAG, CborErrorUnknownType, "Failed Adding optional Encoding Value."); - } - - cborEncoderResult = cbor_encoder_close_container(&credMap, &optionalMap); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing OptionalData Map."); } //CredUsage -- Not Mandatory if(cred->credUsage) @@ -404,78 +710,13 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload strlen(cred->credUsage)); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Credusage Name Value."); } -#endif /* __WITH_X509__ || __WITH_TLS__*/ +#endif /* __WITH_DTLS__ || __WITH_TLS__*/ //PrivateData -- Not Mandatory if(!secureFlag && cred->privateData.data) { - CborEncoder privateMap; - const size_t privateMapSize = 2; - - cborEncoderResult = cbor_encode_text_string(&credMap, OIC_JSON_PRIVATEDATA_NAME, - strlen(OIC_JSON_PRIVATEDATA_NAME)); + cborEncoderResult = SerializeEncodingToCbor(&credMap, + OIC_JSON_PRIVATEDATA_NAME, &cred->privateData); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PrivateData Tag."); - - cborEncoderResult = cbor_encoder_create_map(&credMap, &privateMap, privateMapSize); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding PrivateData Map"); - - // TODO: Need to data strucure modification for OicSecKey_t. - // TODO: Added as workaround, will be replaced soon. - if(OIC_ENCODING_RAW == cred->privateData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_SEC_ENCODING_RAW, - strlen(OIC_SEC_ENCODING_RAW)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Tag."); - cborEncoderResult = cbor_encode_byte_string(&privateMap, cred->privateData.data, - cred->privateData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Value."); - } - else if(OIC_ENCODING_BASE64 == cred->privateData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_SEC_ENCODING_BASE64, - strlen(OIC_SEC_ENCODING_BASE64)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Tag."); - cborEncoderResult = cbor_encode_text_string(&privateMap, (char*)(cred->privateData.data), - cred->privateData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Value."); - } - else if(OIC_ENCODING_DER == cred->privateData.encoding) - { - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_ENCODING_NAME, - strlen(OIC_JSON_ENCODING_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Tag."); - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_SEC_ENCODING_DER, - strlen(OIC_SEC_ENCODING_DER)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Value."); - - cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_DATA_NAME, - strlen(OIC_JSON_DATA_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Tag."); - cborEncoderResult = cbor_encode_byte_string(&privateMap, cred->privateData.data, - cred->privateData.len); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Priv Value."); - } - else - { - OIC_LOG(ERROR, TAG, "Unknow encoding type for private data."); - VERIFY_CBOR_SUCCESS(TAG, CborErrorUnknownType, "Failed Adding Private Encoding Value."); - } - - cborEncoderResult = cbor_encoder_close_container(&credMap, &privateMap); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing PrivateData Map."); } //Period -- Not Mandatory @@ -489,6 +730,21 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Period Name Value."); } +#ifdef MULTIPLE_OWNER + // Eownerid -- Not Mandatory + if(cred->eownerID) + { + char *eowner = NULL; + cborEncoderResult = cbor_encode_text_string(&credMap, OIC_JSON_EOWNERID_NAME, + strlen(OIC_JSON_EOWNERID_NAME)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding eownerId Name Tag."); + ret = ConvertUuidToStr(cred->eownerID, &eowner); + VERIFY_SUCCESS(TAG, ret == OC_STACK_OK, ERROR); + cborEncoderResult = cbor_encode_text_string(&credMap, eowner, strlen(eowner)); + VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Addding eownerId Value."); + OICFree(eowner); + } +#endif //MULTIPLE_OWNER cborEncoderResult = cbor_encoder_close_container(&credArray, &credMap); VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing Cred Map."); @@ -554,7 +810,7 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload { OIC_LOG(DEBUG, TAG, "CredToCBORPayload Successed"); *cborPayload = outPayload; - *cborSize = encoder.ptr - outPayload; + *cborSize = cbor_encoder_get_buffer_size(&encoder, outPayload); ret = OC_STACK_OK; } OIC_LOG(DEBUG, TAG, "CredToCBORPayload OUT"); @@ -565,7 +821,7 @@ exit: // reallocate and try again! OICFree(outPayload); // Since the allocated initial memory failed, double the memory. - cborLen += encoder.ptr - encoder.end; + cborLen += cbor_encoder_get_buffer_size(&encoder, encoder.end); cborEncoderResult = CborNoError; ret = CredToCBORPayload(credS, cborPayload, &cborLen, secureFlag); *cborSize = cborLen; @@ -599,6 +855,7 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, cbor_parser_init(cborPayload, size, 0, &parser, &credCbor); OicSecCred_t *headCred = (OicSecCred_t *) OICCalloc(1, sizeof(OicSecCred_t)); + VERIFY_NON_NULL(TAG, headCred, ERROR); // Enter CRED Root Map CborValue CredRootMap = { .parser = NULL, .ptr = NULL, .remaining = 0, .extra = 0, .type = 0, .flags = 0 }; @@ -644,6 +901,7 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, else { cred = (OicSecCred_t *) OICCalloc(1, sizeof(OicSecCred_t)); + VERIFY_NON_NULL(TAG, cred, ERROR); OicSecCred_t *temp = headCred; while (temp->next) { @@ -652,8 +910,6 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, temp->next = cred; } - VERIFY_NON_NULL(TAG, cred, ERROR); - while(cbor_value_is_valid(&credMap) && cbor_value_is_text_string(&credMap)) { char* name = NULL; @@ -695,210 +951,42 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, // credtype if (strcmp(name, OIC_JSON_CREDTYPE_NAME) == 0) { +#ifdef __TIZENRT__ + cborFindResult = cbor_value_get_int(&credMap, (int *) &cred->credType); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding CredType."); +#else uint64_t credType = 0; cborFindResult = cbor_value_get_uint64(&credMap, &credType); VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding CredType."); cred->credType = (OicSecCredType_t)credType; +#endif } // privatedata if (strcmp(name, OIC_JSON_PRIVATEDATA_NAME) == 0) { - CborValue privateMap = { .parser = NULL }; - cborFindResult = cbor_value_enter_container(&credMap, &privateMap); + cborFindResult = DeserializeEncodingFromCbor(&credMap, &cred->privateData); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to read privateData structure"); - while (cbor_value_is_valid(&privateMap)) + OicEncodingType_t encoding = cred->privateData.encoding; + if (OIC_ENCODING_DER == encoding || OIC_ENCODING_PEM == encoding) { - char* privname = NULL; - CborType type = cbor_value_get_type(&privateMap); - if (type == CborTextStringType && cbor_value_is_text_string(&privateMap)) - { - cborFindResult = cbor_value_dup_text_string(&privateMap, &privname, - &len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to get text"); - cborFindResult = cbor_value_advance(&privateMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to advance value"); - } - if (privname) - { - // PrivateData::privdata -- Mandatory - if (strcmp(privname, OIC_JSON_DATA_NAME) == 0) - { - if(cbor_value_is_byte_string(&privateMap)) - { - cborFindResult = cbor_value_dup_byte_string(&privateMap, &cred->privateData.data, - &cred->privateData.len, NULL); - } - else if(cbor_value_is_text_string(&privateMap)) - { - cborFindResult = cbor_value_dup_text_string(&privateMap, (char**)(&cred->privateData.data), - &cred->privateData.len, NULL); - } - else - { - cborFindResult = CborErrorUnknownType; - OIC_LOG(ERROR, TAG, "Unknow type for private data."); - } - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding PrivateData."); - } - - // PrivateData::encoding -- Mandatory - if (strcmp(privname, OIC_JSON_ENCODING_NAME) == 0) - { - // TODO: Added as workaround. Will be replaced soon. - char* strEncoding = NULL; - cborFindResult = cbor_value_dup_text_string(&privateMap, &strEncoding, &len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding EncodingType"); - - if(strcmp(strEncoding, OIC_SEC_ENCODING_RAW) == 0) - { - cred->privateData.encoding = OIC_ENCODING_RAW; - } - else if(strcmp(strEncoding, OIC_SEC_ENCODING_BASE64) == 0) - { - cred->privateData.encoding = OIC_ENCODING_BASE64; - } - else - { - //For unit test - cred->privateData.encoding = OIC_ENCODING_RAW; - OIC_LOG(WARNING, TAG, "Unknow encoding type dectected for private data."); - } - - OICFree(strEncoding); - } - } - if (cbor_value_is_valid(&privateMap)) - { - cborFindResult = cbor_value_advance(&privateMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing privatedata Map."); - } - OICFree(privname); + //For unit test + cred->privateData.encoding = OIC_ENCODING_RAW; + OIC_LOG(WARNING, TAG, "Unknown encoding type detected for private data."); } - } -#if defined(__WITH_X509__) || defined(__WITH_TLS__) +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) //PublicData -- Not Mandatory if (strcmp(name, OIC_JSON_PUBLICDATA_NAME) == 0) { - CborValue pubMap = { .parser = NULL }; - cborFindResult = cbor_value_enter_container(&credMap, &pubMap); - - while (cbor_value_is_valid(&pubMap)) - { - char* pubname = NULL; - CborType type = cbor_value_get_type(&pubMap); - if (type == CborTextStringType && cbor_value_is_text_string(&pubMap)) - { - cborFindResult = cbor_value_dup_text_string(&pubMap, &pubname, - &len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to get text"); - cborFindResult = cbor_value_advance(&pubMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to advance value"); - } - if (pubname) - { - // PrivateData::privdata -- Mandatory - if (strcmp(pubname, OIC_JSON_DATA_NAME) == 0 && cbor_value_is_byte_string(&pubMap)) - { - cborFindResult = cbor_value_dup_byte_string(&pubMap, &cred->publicData.data, - &cred->publicData.len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding PubData."); - } - // PublicData::encoding -- Mandatory - if (strcmp(pubname, OIC_JSON_ENCODING_NAME) == 0) - { - // TODO: Need to update data structure, just ignore encoding value now. - } - } - if (cbor_value_is_valid(&pubMap)) - { - cborFindResult = cbor_value_advance(&pubMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing publicdata Map."); - } - OICFree(pubname); - } + cborFindResult = DeserializeEncodingFromCbor(&credMap, &cred->publicData); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to read publicData structure"); } //OptionalData -- Not Mandatory if (strcmp(name, OIC_JSON_OPTDATA_NAME) == 0) { - CborValue optMap = { .parser = NULL }; - cborFindResult = cbor_value_enter_container(&credMap, &optMap); - - while (cbor_value_is_valid(&optMap)) - { - char* optname = NULL; - CborType type = cbor_value_get_type(&optMap); - if (type == CborTextStringType && cbor_value_is_text_string(&optMap)) - { - cborFindResult = cbor_value_dup_text_string(&optMap, &optname, - &len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to get text"); - cborFindResult = cbor_value_advance(&optMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to advance value"); - } - if (optname) - { - // OptionalData::optdata -- Mandatory - if (strcmp(optname, OIC_JSON_DATA_NAME) == 0) - { - if(cbor_value_is_byte_string(&optMap)) - { - cborFindResult = cbor_value_dup_byte_string(&optMap, &cred->optionalData.data, - &cred->optionalData.len, NULL); - } - else if(cbor_value_is_text_string(&optMap)) - { - cborFindResult = cbor_value_dup_text_string(&optMap, (char**)(&cred->optionalData.data), - &cred->optionalData.len, NULL); - } - else - { - cborFindResult = CborErrorUnknownType; - OIC_LOG(ERROR, TAG, "Unknow type for optional data."); - } - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding OptionalData."); - } - // OptionalData::encoding -- Mandatory - if (strcmp(optname, OIC_JSON_ENCODING_NAME) == 0) - { - // TODO: Added as workaround. Will be replaced soon. - char* strEncoding = NULL; - cborFindResult = cbor_value_dup_text_string(&optMap, &strEncoding, &len, NULL); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding EncodingType"); - - if(strcmp(strEncoding, OIC_SEC_ENCODING_RAW) == 0) - { - OIC_LOG(INFO,TAG,"cbor_value_is_byte_string"); - cred->optionalData.encoding = OIC_ENCODING_RAW; - } - else if(strcmp(strEncoding, OIC_SEC_ENCODING_BASE64) == 0) - { - cred->optionalData.encoding = OIC_ENCODING_BASE64; - } - else if(strcmp(strEncoding, OIC_SEC_ENCODING_PEM) == 0) - { - cred->optionalData.encoding = OIC_ENCODING_PEM; - } - else if(strcmp(strEncoding, OIC_SEC_ENCODING_DER) == 0) - { - cred->optionalData.encoding = OIC_ENCODING_DER; - } - else - { - //For unit test - cred->optionalData.encoding = OIC_ENCODING_RAW; - OIC_LOG(WARNING, TAG, "Unknow encoding type dectected for optional data."); - } - OICFree(strEncoding); - } - } - if (cbor_value_is_valid(&optMap)) - { - cborFindResult = cbor_value_advance(&optMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing optdata Map."); - } - OICFree(optname); - } + cborFindResult = DeserializeSecOptFromCbor(&credMap, &cred->optionalData); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed to read optionalData structure"); } //Credusage -- Not Mandatory if (0 == strcmp(OIC_JSON_CREDUSAGE_NAME, name)) @@ -906,7 +994,7 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, cborFindResult = cbor_value_dup_text_string(&credMap, &cred->credUsage, &len, NULL); VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding Period."); } -#endif //__WITH_X509__ || __WITH_TLS__ +#endif //__WITH_DTLS__ || __WITH_TLS__ if (0 == strcmp(OIC_JSON_PERIOD_NAME, name)) { @@ -914,11 +1002,29 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding Period."); } - if (cbor_value_is_valid(&credMap)) +#ifdef MULTIPLE_OWNER + // Eowner uuid -- Not Mandatory + if (strcmp(OIC_JSON_EOWNERID_NAME, name) == 0 && cbor_value_is_text_string(&credMap)) { - cborFindResult = cbor_value_advance(&credMap); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing CRED Map."); - } + char *eowner = NULL; + cborFindResult = cbor_value_dup_text_string(&credMap, &eowner, &len, NULL); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding eownerId Value."); + if(NULL == cred->eownerID) + { + cred->eownerID = (OicUuid_t*)OICCalloc(1, sizeof(OicUuid_t)); + VERIFY_NON_NULL(TAG, cred->eownerID, ERROR); + } + ret = ConvertStrToUuid(eowner, cred->eownerID); + OICFree(eowner); + VERIFY_SUCCESS(TAG, OC_STACK_OK == ret , ERROR); + } +#endif //MULTIPLE_OWNER + + if (cbor_value_is_valid(&credMap)) + { + cborFindResult = cbor_value_advance(&credMap); + VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing CRED Map."); + } OICFree(name); } } @@ -942,6 +1048,10 @@ OCStackResult CBORPayloadToCred(const uint8_t *cborPayload, size_t size, VERIFY_SUCCESS(TAG, ret == OC_STACK_OK, ERROR); OICFree(stRowner); } + else if (NULL != gCred) + { + memcpy(&(headCred->rownerID), &(gCred->rownerID), sizeof(OicUuid_t)); + } OICFree(tagName); } if (cbor_value_is_valid(&CredRootMap)) @@ -966,10 +1076,38 @@ exit: return ret; } +#ifdef MULTIPLE_OWNER +bool IsValidCredentialAccessForSubOwner(const OicUuid_t* uuid, const uint8_t *cborPayload, size_t size) +{ + OicSecCred_t* cred = NULL; + bool isValidCred = false; + + OIC_LOG_BUFFER(DEBUG, TAG, cborPayload, size); + + VERIFY_NON_NULL(TAG, uuid, ERROR); + VERIFY_NON_NULL(TAG, cborPayload, ERROR); + VERIFY_SUCCESS(TAG, 0 != size, ERROR); + VERIFY_SUCCESS(TAG, OC_STACK_OK == CBORPayloadToCred(cborPayload, size, &cred), ERROR); + VERIFY_NON_NULL(TAG, cred, ERROR); + VERIFY_NON_NULL(TAG, cred->eownerID, ERROR); + VERIFY_SUCCESS(TAG, (memcmp(cred->eownerID->id, uuid->id, sizeof(uuid->id)) == 0), ERROR); + + isValidCred = true; + +exit: + DeleteCredList(cred); + + return isValidCred; + +} +#endif //MULTIPLE_OWNER + OicSecCred_t * GenerateCredential(const OicUuid_t * subject, OicSecCredType_t credType, - const OicSecCert_t * publicData, const OicSecKey_t* privateData, - const OicUuid_t * rownerID) + const OicSecKey_t * publicData, const OicSecKey_t* privateData, + const OicUuid_t * rownerID, const OicUuid_t * eownerID) { + OIC_LOG(DEBUG, TAG, "IN GenerateCredential"); + (void)publicData; OCStackResult ret = OC_STACK_ERROR; @@ -987,7 +1125,7 @@ OicSecCred_t * GenerateCredential(const OicUuid_t * subject, OicSecCredType_t cr SYMMETRIC_GROUP_KEY | ASYMMETRIC_KEY | SIGNED_ASYMMETRIC_KEY | PIN_PASSWORD), ERROR); cred->credType = credType; -#ifdef __WITH_X509__ +#ifdef __WITH_DTLS__ if (publicData && publicData->data) { cred->publicData.data = (uint8_t *)OICCalloc(1, publicData->len); @@ -995,7 +1133,7 @@ OicSecCred_t * GenerateCredential(const OicUuid_t * subject, OicSecCredType_t cr memcpy(cred->publicData.data, publicData->data, publicData->len); cred->publicData.len = publicData->len; } -#endif // __WITH_X509__ +#endif // __WITH_DTLS__ if (privateData && privateData->data) { @@ -1003,54 +1141,77 @@ OicSecCred_t * GenerateCredential(const OicUuid_t * subject, OicSecCredType_t cr VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR); memcpy(cred->privateData.data, privateData->data, privateData->len); cred->privateData.len = privateData->len; - - // TODO: Added as workaround. Will be replaced soon. cred->privateData.encoding = OIC_ENCODING_RAW; + } -#if 0 - // NOTE: Test codes to use base64 for credential. - uint32_t outSize = 0; - size_t b64BufSize = B64ENCODE_OUT_SAFESIZE((privateData->len + 1)); - char* b64Buf = (uint8_t *)OICCalloc(1, b64BufSize); - VERIFY_NON_NULL(TAG, b64Buf, ERROR); - b64Encode(privateData->data, privateData->len, b64Buf, b64BufSize, &outSize); + VERIFY_NON_NULL(TAG, rownerID, ERROR); + memcpy(&cred->rownerID, rownerID, sizeof(OicUuid_t)); - OICFree( cred->privateData.data ); - cred->privateData.data = (uint8_t *)OICCalloc(1, outSize + 1); - VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR); +#ifdef MULTIPLE_OWNER + if(eownerID) + { + cred->eownerID = (OicUuid_t*)OICCalloc(1, sizeof(OicUuid_t)); + VERIFY_NON_NULL(TAG, cred->eownerID, ERROR); + memcpy(cred->eownerID->id, eownerID->id, sizeof(eownerID->id)); + } +#else + (void)(eownerID); +#endif //MULTIPLE_OWNER_ - strcpy(cred->privateData.data, b64Buf); - cred->privateData.encoding = OIC_ENCODING_BASE64; - cred->privateData.len = outSize; - OICFree(b64Buf); -#endif //End of Test codes + ret = OC_STACK_OK; + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : result: %d", ret); + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : credId: %d", cred->credId); + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : credType: %d", cred->credType); + OIC_LOG_BUFFER(DEBUG, TAG, cred->subject.id, sizeof(cred->subject.id)); + if (cred->privateData.data) + { + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : privateData len: %d", cred->privateData.len); + OIC_LOG_BUFFER(DEBUG, TAG, cred->privateData.data, cred->privateData.len); + } +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + if(cred->credUsage) + { + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : credUsage: %s", cred->credUsage); } + if (cred->publicData.data) + { + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : publicData len: %d", cred->publicData.len); + OIC_LOG_BUFFER(DEBUG, TAG, cred->publicData.data, cred->publicData.len); - VERIFY_NON_NULL(TAG, rownerID, ERROR); - memcpy(&cred->rownerID, rownerID, sizeof(OicUuid_t)); + } + if (cred->optionalData.data) + { + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : optionalData len: %d", cred->optionalData.len); + OIC_LOG_BUFFER(DEBUG, TAG, cred->optionalData.data, cred->optionalData.len); + OIC_LOG_V(DEBUG, TAG, "GenerateCredential : optionalData revstat: %d", cred->optionalData.revstat); + } +#endif //defined(__WITH_DTLS__) || defined(__WITH_TLS__) - ret = OC_STACK_OK; exit: if (OC_STACK_OK != ret) { DeleteCredList(cred); cred = NULL; } + OIC_LOG(DEBUG, TAG, "OUT GenerateCredential"); return cred; } static bool UpdatePersistentStorage(const OicSecCred_t *cred) { bool ret = false; + OIC_LOG(DEBUG, TAG, "IN Cred UpdatePersistentStorage"); // Convert Cred data into JSON for update to persistent storage if (cred) { uint8_t *payload = NULL; - // This added '256' is arbitrary value that is added to cover the name of the resource, map addition and ending + // This added '512' is arbitrary value that is added to cover the name of the resource, map addition and ending size_t size = GetCredKeyDataSize(cred); - size += (256 * OicSecCredCount(cred)); + size += (512 * OicSecCredCount(cred)); + OIC_LOG_V(INFO, TAG, "target cred size: %zu - temporal size to make room for encoding", size); + int secureFlag = 0; OCStackResult res = CredToCBORPayload(cred, &payload, &size, secureFlag); if ((OC_STACK_OK == res) && payload) @@ -1059,6 +1220,7 @@ static bool UpdatePersistentStorage(const OicSecCred_t *cred) { ret = true; } + OICClearMemory(payload, size); OICFree(payload); } } @@ -1069,6 +1231,7 @@ static bool UpdatePersistentStorage(const OicSecCred_t *cred) ret = true; } } + OIC_LOG(DEBUG, TAG, "OUT Cred UpdatePersistentStorage"); return ret; } @@ -1142,24 +1305,206 @@ static OicSecCred_t* GetCredDefault() return NULL; } +static bool IsSameSecOpt(const OicSecOpt_t* sk1, const OicSecOpt_t* sk2) +{ + VERIFY_NON_NULL(TAG, sk1, WARNING); + VERIFY_NON_NULL(TAG, sk2, WARNING); + + VERIFY_SUCCESS(TAG, (sk1->len == sk2->len), INFO); + VERIFY_SUCCESS(TAG, (sk1->encoding == sk2->encoding), INFO); + VERIFY_SUCCESS(TAG, (0 == memcmp(sk1->data, sk2->data, sk1->len)), INFO); + return true; +exit: + return false; +} + +static bool IsSameSecKey(const OicSecKey_t* sk1, const OicSecKey_t* sk2) +{ + VERIFY_NON_NULL(TAG, sk1, WARNING); + VERIFY_NON_NULL(TAG, sk2, WARNING); + + VERIFY_SUCCESS(TAG, (sk1->len == sk2->len), INFO); + VERIFY_SUCCESS(TAG, (sk1->encoding == sk2->encoding), INFO); + VERIFY_SUCCESS(TAG, (0 == memcmp(sk1->data, sk2->data, sk1->len)), INFO); + return true; +exit: + return false; +} + +/** + * Compares credential + * + * @return CRED_CMP_EQUAL if credentials are equal + * CRED_CMP_NOT_EQUAL if not equal + * otherwise error. + */ + +static CredCompareResult_t CompareCredential(const OicSecCred_t * l, const OicSecCred_t * r) +{ + CredCompareResult_t cmpResult = CRED_CMP_ERROR; + bool isCompared = false; + OIC_LOG(DEBUG, TAG, "IN CompareCredetial"); + + VERIFY_NON_NULL(TAG, l, ERROR); + VERIFY_NON_NULL(TAG, r, ERROR); + + cmpResult = CRED_CMP_NOT_EQUAL; + + VERIFY_SUCCESS(TAG, (l->credType == r->credType), INFO); + VERIFY_SUCCESS(TAG, (0 == memcmp(l->subject.id, r->subject.id, sizeof(l->subject.id))), INFO); + + switch(l->credType) + { + case SYMMETRIC_PAIR_WISE_KEY: + case SYMMETRIC_GROUP_KEY: + case PIN_PASSWORD: + { + if(l->privateData.data && r->privateData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecKey(&l->privateData, &r->privateData), INFO); + isCompared = true; + } + break; + } +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + case ASYMMETRIC_KEY: + case SIGNED_ASYMMETRIC_KEY: + { + if(l->publicData.data && r->publicData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecKey(&l->publicData, &r->publicData), INFO); + isCompared = true; + } + + if(l->optionalData.data && r->optionalData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecOpt(&l->optionalData, &r->optionalData), INFO); + isCompared = true; + } + + if(l->credUsage && r->credUsage) + { + VERIFY_SUCCESS(TAG, (strlen(l->credUsage) == strlen(r->credUsage)), INFO); + VERIFY_SUCCESS(TAG, (0 == strncmp(l->credUsage, r->credUsage, strlen(l->credUsage))), INFO); + isCompared = true; + } + break; + } + case ASYMMETRIC_ENCRYPTION_KEY: + { + if(l->privateData.data && r->privateData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecKey(&l->privateData, &r->privateData), INFO); + isCompared = true; + } + + if(l->publicData.data && r->publicData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecKey(&l->publicData, &r->publicData), INFO); + isCompared = true; + } + + if(l->optionalData.data && r->optionalData.data) + { + VERIFY_SUCCESS(TAG, IsSameSecOpt(&l->optionalData, &r->optionalData), INFO); + isCompared = true; + } + + break; + } +#endif //__WITH_DTLS__ or __WITH_TLS__ + default: + { + OIC_LOG_V(ERROR, TAG, "Invalid CredType(%d)", l->credType); + cmpResult = CRED_CMP_ERROR; + goto exit; + } + } + + if(isCompared) + { + OIC_LOG(DEBUG, TAG, "Same Credentials"); + cmpResult = CRED_CMP_EQUAL; + } + else + { + OIC_LOG(DEBUG, TAG, "Can not find the key data in credential"); + cmpResult = CRED_CMP_ERROR; + } +exit: + OIC_LOG(DEBUG, TAG, "OUT CompareCredetial"); + + return cmpResult; +} + OCStackResult AddCredential(OicSecCred_t * newCred) { OCStackResult ret = OC_STACK_ERROR; - VERIFY_SUCCESS(TAG, NULL != newCred, ERROR); + OicSecCred_t * temp = NULL; + bool validFlag = true; + OicUuid_t emptyOwner = { .id = {0} }; + + OIC_LOG(DEBUG, TAG, "IN AddCredential"); + VERIFY_SUCCESS(TAG, NULL != newCred, ERROR); //Assigning credId to the newCred newCred->credId = GetCredId(); - VERIFY_SUCCESS(TAG, newCred->credId != 0, ERROR); + VERIFY_SUCCESS(TAG, true == IsValidCredential(newCred), ERROR); - //Append the new Cred to existing list - LL_APPEND(gCred, newCred); + //the newCred is not valid if it is empty + if (memcmp(&(newCred->subject), &emptyOwner, sizeof(OicUuid_t)) == 0) + { + validFlag = false; + } + else + { + LL_FOREACH(gCred, temp) + { + CredCompareResult_t cmpRes = CompareCredential(temp, newCred); + if(CRED_CMP_EQUAL == cmpRes) + { + OIC_LOG_V(WARNING, TAG, "Detected same credential ID(%d)" \ + "new credential's ID will be replaced.", temp->credId); + newCred->credId = temp->credId; + ret = OC_STACK_OK; + validFlag = false; + break; + } + + if (CRED_CMP_ERROR == cmpRes) + { + OIC_LOG_V(WARNING, TAG, "Credential skipped : %d", cmpRes); + ret = OC_STACK_ERROR; + validFlag = false; + break; + } + } + } + + //Append the new Cred to existing list if new Cred is valid + if (validFlag) + { + OIC_LOG(INFO, TAG, "New credentials are added to the cred resource"); + LL_APPEND(gCred, newCred); + } + if (memcmp(&(newCred->rownerID), &emptyOwner, sizeof(OicUuid_t)) != 0) + { + memcpy(&(gCred->rownerID), &(newCred->rownerID), sizeof(OicUuid_t)); + } if (UpdatePersistentStorage(gCred)) { + OIC_LOG(DEBUG, TAG, "UpdatePersistentStorage() Success"); ret = OC_STACK_OK; } - + else + { + OIC_LOG(ERROR, TAG, "UpdatePersistentStorage() Failed"); + LL_DELETE(gCred, newCred); + ret = OC_STACK_INCONSISTENT_DB; + } exit: + OIC_LOG(DEBUG, TAG, "OUT AddCredential"); return ret; } @@ -1191,6 +1536,46 @@ OCStackResult RemoveCredential(const OicUuid_t *subject) } +OCStackResult RemoveCredentialByCredId(uint16_t credId) +{ + OCStackResult ret = OC_STACK_ERROR; + OicSecCred_t *cred = NULL; + OicSecCred_t *tempCred = NULL; + bool deleteFlag = false; + + OIC_LOG(INFO, TAG, "IN RemoveCredentialByCredId"); + + if ( 0 == credId) + { + return OC_STACK_INVALID_PARAM; + } + + + LL_FOREACH_SAFE(gCred, cred, tempCred) + { + if (cred->credId == credId) + { + OIC_LOG_V(DEBUG, TAG, "Credential(ID=%d) will be removed.", credId); + + LL_DELETE(gCred, cred); + FreeCred(cred); + deleteFlag = true; + } + } + + if (deleteFlag) + { + if (UpdatePersistentStorage(gCred)) + { + ret = OC_STACK_RESOURCE_DELETED; + } + } + OIC_LOG(INFO, TAG, "OUT RemoveCredentialByCredId"); + + return ret; + +} + /** * Remove all credential data on credential resource and persistent storage * @@ -1227,6 +1612,8 @@ static bool FillPrivateDataOfOwnerPSK(OicSecCred_t* receviedCred, const CAEndpoi { //Derive OwnerPSK locally const char* oxmLabel = GetOxmString(doxm->oxmSel); + char* b64Buf = NULL; + size_t b64BufSize = 0; VERIFY_NON_NULL(TAG, oxmLabel, ERROR); uint8_t ownerPSK[OWNER_PSK_LENGTH_128] = {0}; @@ -1245,45 +1632,220 @@ static bool FillPrivateDataOfOwnerPSK(OicSecCred_t* receviedCred, const CAEndpoi // TODO: Added as workaround, will be replaced soon. if(OIC_ENCODING_RAW == receviedCred->privateData.encoding) { +#ifndef __TIZENRT__ receviedCred->privateData.data = (uint8_t *)OICCalloc(1, OWNER_PSK_LENGTH_128); +#else + receviedCred->privateData.data = (uint8_t *)OICRealloc(receviedCred->privateData.data, OWNER_PSK_LENGTH_128); +#endif VERIFY_NON_NULL(TAG, receviedCred->privateData.data, ERROR); receviedCred->privateData.len = OWNER_PSK_LENGTH_128; memcpy(receviedCred->privateData.data, ownerPSK, OWNER_PSK_LENGTH_128); } else if(OIC_ENCODING_BASE64 == receviedCred->privateData.encoding) { + B64Result b64res = B64_OK; uint32_t b64OutSize = 0; - size_t b64BufSize = B64ENCODE_OUT_SAFESIZE((OWNER_PSK_LENGTH_128 + 1)); - char* b64Buf = OICCalloc(1, b64BufSize); + b64BufSize = B64ENCODE_OUT_SAFESIZE((OWNER_PSK_LENGTH_128 + 1)); + b64Buf = OICCalloc(1, b64BufSize); VERIFY_NON_NULL(TAG, b64Buf, ERROR); - b64Encode(ownerPSK, OWNER_PSK_LENGTH_128, b64Buf, b64BufSize, &b64OutSize); - + b64res = b64Encode(ownerPSK, OWNER_PSK_LENGTH_128, b64Buf, b64BufSize, &b64OutSize); + VERIFY_SUCCESS(TAG, B64_OK == b64res, ERROR); +#ifndef __TIZENRT__ receviedCred->privateData.data = (uint8_t *)OICCalloc(1, b64OutSize + 1); +#else + receviedCred->privateData.data = (uint8_t *)OICRealloc(receviedCred->privateData.data, b64OutSize + 1); +#endif VERIFY_NON_NULL(TAG, receviedCred->privateData.data, ERROR); receviedCred->privateData.len = b64OutSize; strncpy((char*)receviedCred->privateData.data, b64Buf, b64OutSize); receviedCred->privateData.data[b64OutSize] = '\0'; + OICClearMemory(b64Buf, b64BufSize); + OICFree(b64Buf); + b64Buf = NULL; } else { - // TODO: error VERIFY_SUCCESS(TAG, OIC_ENCODING_UNKNOW, ERROR); } OIC_LOG(INFO, TAG, "PrivateData of OwnerPSK was calculated successfully"); + OICClearMemory(ownerPSK, sizeof(ownerPSK)); + //Verify OwnerPSK information return (memcmp(&(receviedCred->subject), &(doxm->owner), sizeof(OicUuid_t)) == 0 && receviedCred->credType == SYMMETRIC_PAIR_WISE_KEY); exit: //receviedCred->privateData.data will be deallocated when deleting credential. + OICClearMemory(ownerPSK, sizeof(ownerPSK)); + OICClearMemory(b64Buf, b64BufSize); + OICFree(b64Buf); + return false; +} + + +#ifdef MULTIPLE_OWNER +/** + * Internal function to fill private data of SubOwner PSK. + * + * @param receviedCred recevied owner credential from SubOwner + * @param ownerAdd address of SubOwner + * @param doxm current device's doxm resource + * + * @return + * true successfully done and valid subower psk information + * false Invalid subowner psk information or failed to subowner psk generation + */ +static bool FillPrivateDataOfSubOwnerPSK(OicSecCred_t* receivedCred, const CAEndpoint_t* ownerAddr, + const OicSecDoxm_t* doxm, const OicUuid_t* subOwner) +{ + char* b64Buf = NULL; + //Derive OwnerPSK locally + const char* oxmLabel = GetOxmString(doxm->oxmSel); + VERIFY_NON_NULL(TAG, oxmLabel, ERROR); + + uint8_t subOwnerPSK[OWNER_PSK_LENGTH_128] = {0}; + CAResult_t pskRet = CAGenerateOwnerPSK(ownerAddr, + (uint8_t*)oxmLabel, strlen(oxmLabel), + subOwner->id, sizeof(subOwner->id), + doxm->deviceID.id, sizeof(doxm->deviceID.id), + subOwnerPSK, OWNER_PSK_LENGTH_128); + VERIFY_SUCCESS(TAG, pskRet == CA_STATUS_OK, ERROR); + + OIC_LOG(DEBUG, TAG, "SubOwnerPSK dump :"); + OIC_LOG_BUFFER(DEBUG, TAG, subOwnerPSK, OWNER_PSK_LENGTH_128); + + //Generate owner credential based on received credential information + + if(OIC_ENCODING_RAW == receivedCred->privateData.encoding) + { + receivedCred->privateData.data = (uint8_t *)OICCalloc(1, OWNER_PSK_LENGTH_128); + VERIFY_NON_NULL(TAG, receivedCred->privateData.data, ERROR); + receivedCred->privateData.len = OWNER_PSK_LENGTH_128; + memcpy(receivedCred->privateData.data, subOwnerPSK, OWNER_PSK_LENGTH_128); + } + else if(OIC_ENCODING_BASE64 == receivedCred->privateData.encoding) + { + uint32_t b64OutSize = 0; + size_t b64BufSize = B64ENCODE_OUT_SAFESIZE((OWNER_PSK_LENGTH_128 + 1)); + b64Buf = OICCalloc(1, b64BufSize); + VERIFY_NON_NULL(TAG, b64Buf, ERROR); + + VERIFY_SUCCESS(TAG, \ + B64_OK == b64Encode(subOwnerPSK, OWNER_PSK_LENGTH_128, b64Buf, b64BufSize, &b64OutSize), \ + ERROR); + + receivedCred->privateData.data = (uint8_t *)OICCalloc(1, b64OutSize + 1); + VERIFY_NON_NULL(TAG, receivedCred->privateData.data, ERROR); + receivedCred->privateData.len = b64OutSize; + strncpy((char*)receivedCred->privateData.data, b64Buf, b64OutSize); + receivedCred->privateData.data[b64OutSize] = '\0'; + } + else + { + OIC_LOG(INFO, TAG, "Unknown credential encoding type."); + VERIFY_SUCCESS(TAG, OIC_ENCODING_UNKNOW, ERROR); + } + + OIC_LOG(INFO, TAG, "PrivateData of SubOwnerPSK was calculated successfully"); + OICFree(b64Buf); + return true; +exit: + //receivedCred->privateData.data will be deallocated when deleting credential. + OICFree(b64Buf); return false; } +#endif //MULTIPLE_OWNER -#endif //__WITH_DTLS__ -static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * ehRequest) +OCStackResult AddPreconfPinCredential(const char* preconfPin) +{ + OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + +#ifdef MULTIPLE_OWNER + OCStackResult res = OC_STACK_INVALID_PARAM; + OicSecCred_t* cred = NULL; + OicSecCred_t* pinCred = NULL; + VERIFY_NON_NULL(TAG, preconfPin, ERROR); + VERIFY_SUCCESS(TAG, (strlen(preconfPin) >= PRECONF_PIN_MIN_SIZE), ERROR); + + OIC_LOG(DEBUG, TAG, "Finding previous preconfigured PIN..."); + //Find the previous PIN + LL_FOREACH(gCred, cred) + { + if(memcmp(cred->subject.id, WILDCARD_SUBJECT_ID.id, sizeof(cred->subject.id)) == 0 && + PIN_PASSWORD == cred->credType) + { + break; + } + } + + //If previous PIN is exist, remove it. + if (cred) + { + OIC_LOG_V(DEBUG, TAG, "Preconfigured PIN already exist."); + OIC_LOG_V(DEBUG, TAG, "Previous preconfigured PIN will be removed."); + + res = RemoveCredentialByCredId(cred->credId); + if (OC_STACK_RESOURCE_DELETED != res) + { + OIC_LOG_V(ERROR, TAG, "RemoveCredentialByCredId error : %d", res); + cred = NULL; + goto exit; + } + } + + OIC_LOG(DEBUG, TAG, "Adding preconfigured PIN..."); + //Add preconfig PIN + res = OC_STACK_NO_MEMORY; + //Generate PIN based credential + size_t preconfPinLen = strlen(preconfPin); + pinCred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t)); + VERIFY_NON_NULL(TAG, pinCred, ERROR); + + pinCred->privateData.data = (uint8_t*)OICMalloc(preconfPinLen + 1); + VERIFY_NON_NULL(TAG, pinCred->privateData.data, ERROR); + + memcpy(pinCred->privateData.data, preconfPin, preconfPinLen); + pinCred->privateData.data[preconfPinLen] = '\0'; + pinCred->privateData.len = preconfPinLen; + pinCred->privateData.encoding = OIC_ENCODING_RAW; + pinCred->credType = PIN_PASSWORD; + memcpy(pinCred->subject.id, WILDCARD_SUBJECT_ID.id, sizeof(pinCred->subject.id)); + + res = AddCredential(pinCred); + if (OC_STACK_OK != res) + { + OIC_LOG_V(ERROR, TAG, "AddCredential error : %d", res); + goto exit; + } + + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); + return OC_STACK_OK; +exit: + if (cred) + { + FreeCred(cred); + } + if (pinCred) + { + FreeCred(pinCred); + } + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); + return res; +#else + OC_UNUSED(preconfPin); + OIC_LOG(DEBUG, TAG, "Multiple Owner is not enabled."); + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); + return OC_STACK_ERROR; +#endif //MULTIPLE_OWNER +} + + +#endif // __WITH_DTLS__ or __WITH_TLS__ + +static OCEntityHandlerResult HandlePostRequest(OCEntityHandlerRequest * ehRequest) { OCEntityHandlerResult ret = OC_EH_ERROR; OIC_LOG(DEBUG, TAG, "HandleCREDPostRequest IN"); @@ -1307,8 +1869,32 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh { case SYMMETRIC_PAIR_WISE_KEY: { - OCServerRequest *request = (OCServerRequest *)ehRequest->requestHandle; + OCServerRequest *request = GetServerRequestUsingHandle(ehRequest->requestHandle); + if (NULL == request) + { + OIC_LOG(ERROR, TAG, "Failed to get a server request information."); + ret = OC_EH_ERROR; + break; + } +#ifdef __TIZENRT__ + CAEndpoint_t *ep_addr = (CAEndpoint_t *)malloc(sizeof(CAEndpoint_t)); + if(!ep_addr) + { + ret = OC_STACK_NO_MEMORY; + break; + } + ep_addr->adapter= request->devAddr.adapter; + ep_addr->flags= request->devAddr.flags; + ep_addr->port = request->devAddr.port; + memcpy(ep_addr->addr,request->devAddr.addr,MAX_ADDR_STR_SIZE_CA); + ep_addr->ifindex = request->devAddr.ifindex; +#if defined (ROUTING_GATEWAY) || defined (ROUTING_EP) + memcpy(ep_addr->routeData,request->devAddr.routeData,MAX_ADDR_STR_SIZE_CA); +#endif + if(FillPrivateDataOfOwnerPSK(cred, ep_addr, doxm)) +#else if(FillPrivateDataOfOwnerPSK(cred, (CAEndpoint_t *)&request->devAddr, doxm)) +#endif { if(OC_STACK_RESOURCE_DELETED == RemoveCredential(&cred->subject)) { @@ -1331,7 +1917,9 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh OIC_LOG(ERROR, TAG, "Failed to verify receviced OwnerPKS."); ret = OC_EH_ERROR; } - +#ifdef __TIZENRT__ + free(ep_addr); +#endif if(OC_EH_CHANGED == ret) { /** @@ -1340,23 +1928,16 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh */ if(OIC_RANDOM_DEVICE_PIN == doxm->oxmSel) { - OicUuid_t emptyUuid = { .id={0}}; - SetUuidForRandomPinOxm(&emptyUuid); + SetUuidForPinBasedOxm(&emptyUuid); -#ifdef __WITH_TLS__ - if(CA_STATUS_OK != CAregisterTlsCredentialsHandler(GetDtlsPskCredentials)) +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + if(CA_STATUS_OK != CAregisterPskCredentialsHandler(GetDtlsPskCredentials)) { OIC_LOG(ERROR, TAG, "Failed to revert TLS credential handler."); ret = OC_EH_ERROR; break; } -#endif - if(CA_STATUS_OK != CARegisterDTLSCredentialsHandler(GetDtlsPskCredentials)) - { - OIC_LOG(ERROR, TAG, "Failed to revert DTLS credential handler."); - ret = OC_EH_ERROR; - break; - } +#endif // __WITH_DTLS__ or __WITH_TLS__ } //Select cipher suite to use owner PSK @@ -1370,12 +1951,17 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh OIC_LOG(INFO, TAG, "Anonymous cipher suite is DISABLED"); } - if(CA_STATUS_OK != - CASelectCipherSuite(TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256, ehRequest->devAddr.adapter)) + if (CA_STATUS_OK != CASelectCipherSuite( + MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256, CA_ADAPTER_IP)) { - OIC_LOG(ERROR, TAG, "Failed to select cipher suite"); + OIC_LOG(ERROR, TAG, "Failed to enable PSK cipher suite"); ret = OC_EH_ERROR; } + else + { + OIC_LOG(INFO, TAG, "PSK cipher suite is ENABLED"); + } + } break; @@ -1386,50 +1972,141 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh case PIN_PASSWORD: case ASYMMETRIC_ENCRYPTION_KEY: { - OIC_LOG(WARNING, TAG, "Unsupported credential type for owner credential."); + OIC_LOG(WARNING, TAG, "Unsupported credential type for owner credential."); + ret = OC_EH_ERROR; + break; + } + default: + { + OIC_LOG(WARNING, TAG, "Unknown credential type for owner credential."); + ret = OC_EH_ERROR; + break; + } + } + + if(OC_EH_CHANGED != ret) + { + /* + * If some error is occured while ownership transfer, + * ownership transfer related resource should be revert back to initial status. + */ + const OicSecDoxm_t* doxm = GetDoxmResourceData(); + if(doxm) + { + if(!doxm->owned) + { + OIC_LOG(WARNING, TAG, "The operation failed during handle DOXM request"); + + if((OC_ADAPTER_IP == ehRequest->devAddr.adapter && previousMsgId != ehRequest->messageID) + || OC_ADAPTER_TCP == ehRequest->devAddr.adapter) + { +#if defined (__WITH_TLS__) || defined(__WITH_DTLS__) + InvokeOtmEventHandler(ehRequest->devAddr.addr, ehRequest->devAddr.port, + NULL, OIC_OTM_ERROR); +#endif + RestoreDoxmToInitState(); + RestorePstatToInitState(); + OIC_LOG(WARNING, TAG, "DOXM will be reverted."); + } + } + } + else + { + OIC_LOG(ERROR, TAG, "Invalid DOXM resource"); + } + } + } +#ifdef MULTIPLE_OWNER + // In case SubOwner Credential + else if(doxm && doxm->owned && doxm->mom && + OIC_MULTIPLE_OWNER_DISABLE != doxm->mom->mode && + 0 == cred->privateData.len && + 0 == cred->optionalData.len && + 0 == cred->publicData.len ) + { + switch(cred->credType) + { + case SYMMETRIC_PAIR_WISE_KEY: + { + OCServerRequest *request = GetServerRequestUsingHandle(ehRequest->requestHandle); + if(FillPrivateDataOfSubOwnerPSK(cred, (CAEndpoint_t *)&request->devAddr, doxm, &cred->subject)) + { + if(OC_STACK_RESOURCE_DELETED == RemoveCredential(&cred->subject)) + { + OIC_LOG(WARNING, TAG, "The credential with the same subject ID was detected!"); + } + + OIC_LOG(ERROR, TAG, "SubOwnerPSK was generated successfully."); + if(OC_STACK_OK == AddCredential(cred)) + { + ret = OC_EH_CHANGED; + } + else + { + OIC_LOG(ERROR, TAG, "Failed to save the SubOwnerPSK as cred resource"); + ret = OC_EH_ERROR; + } + } + else + { + OIC_LOG(ERROR, TAG, "Failed to verify receviced SubOwner PSK."); + ret = OC_EH_ERROR; + } + } + break; + + case SYMMETRIC_GROUP_KEY: + case ASYMMETRIC_KEY: + case SIGNED_ASYMMETRIC_KEY: + case PIN_PASSWORD: + case ASYMMETRIC_ENCRYPTION_KEY: + { + OIC_LOG(WARNING, TAG, "Unsupported credential type for SubOwner credential."); ret = OC_EH_ERROR; break; } default: { - OIC_LOG(WARNING, TAG, "Unknow credential type for owner credential."); + OIC_LOG(WARNING, TAG, "Unknown credential type for SubOwner credential."); ret = OC_EH_ERROR; break; } } - - if(OC_EH_CHANGED != ret) + } +#endif //MULTIPLE_OWNER + else + { + if(IsEmptyCred(cred)) { - /* - * If some error is occured while ownership transfer, - * ownership transfer related resource should be revert back to initial status. - */ - const OicSecDoxm_t* doxm = GetDoxmResourceData(); - if(doxm) + OicUuid_t emptyUuid = {.id={0}}; + if(memcmp(cred->rownerID.id, emptyUuid.id, sizeof(emptyUuid.id)) != 0) { - if(!doxm->owned && previousMsgId != ehRequest->messageID) + OIC_LOG(INFO, TAG, "CRED's rowner will be updated."); + memcpy(gCred->rownerID.id, cred->rownerID.id, sizeof(cred->rownerID.id)); + if (UpdatePersistentStorage(gCred)) + { + ret = OC_EH_CHANGED; + } + else { - OIC_LOG(WARNING, TAG, "The operation failed during handle DOXM request,"\ - "DOXM will be reverted."); - RestoreDoxmToInitState(); - RestorePstatToInitState(); + ret = OC_EH_ERROR; } } else { - OIC_LOG(ERROR, TAG, "Invalid DOXM resource"); + ret = OC_EH_ERROR; } } - } - else - { - /* - * If the post request credential has credId, it will be - * discarded and the next available credId will be assigned - * to it before getting appended to the existing credential - * list and updating svr database. - */ - ret = (OC_STACK_OK == AddCredential(cred))? OC_EH_CHANGED : OC_EH_ERROR; + else + { + /* + * If the post request credential has credId, it will be + * discarded and the next available credId will be assigned + * to it before getting appended to the existing credential + * list and updating svr database. + */ + ret = (OC_STACK_OK == AddCredential(cred))? OC_EH_CHANGED : OC_EH_ERROR; + } } #else //not __WITH_DTLS__ /* @@ -1453,7 +2130,10 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh } else { - previousMsgId = ehRequest->messageID; + if(OC_ADAPTER_IP == ehRequest->devAddr.adapter) + { + previousMsgId = ehRequest->messageID++; + } } //Send response to request originator ret = ((SendSRMResponse(ehRequest, ret, NULL, 0)) == OC_STACK_OK) ? @@ -1477,7 +2157,6 @@ static OCEntityHandlerResult HandleGetRequest (const OCEntityHandlerRequest * eh const OicSecCred_t *cred = gCred; - size_t credCnt = 0; // This added '256' is arbitrary value that is added to cover the name of the resource, map addition and ending size = GetCredKeyDataSize(cred); size += (256 * OicSecCredCount(cred)); @@ -1490,6 +2169,7 @@ static OCEntityHandlerResult HandleGetRequest (const OCEntityHandlerRequest * eh //Send payload to request originator ehRet = ((SendSRMResponse(ehRequest, ehRet, payload, size)) == OC_STACK_OK) ? OC_EH_OK : OC_EH_ERROR; + OICClearMemory(payload, size); OICFree(payload); return ehRet; } @@ -1588,6 +2268,7 @@ OCStackResult CreateCredResource() OCStackResult InitCredResource() { OCStackResult ret = OC_STACK_ERROR; + OicSecCred_t* cred = NULL; //Read Cred resource from PS uint8_t *data = NULL; @@ -1600,7 +2281,7 @@ OCStackResult InitCredResource() } if (data) { - // Read ACL resource from PS + // Read Cred resource from PS ret = CBORPayloadToCred(data, size, &gCred); } @@ -1613,8 +2294,51 @@ OCStackResult InitCredResource() { gCred = GetCredDefault(); } + + if (gCred) + { + OicUuid_t deviceID; + OicUuid_t emptyUuid = {.id={0}}; + + ret = GetDoxmDeviceID(&deviceID); + if (ret != OC_STACK_OK) + { + OIC_LOG_V(WARNING, TAG, "%s: GetDoxmDeviceID failed, error %d", __func__, ret); + //Unit tests expect error code OC_STACK_INVALID_PARAM. + ret = OC_STACK_INVALID_PARAM; + goto exit; + } + + //Add a log to track the invalid credential. + LL_FOREACH(gCred, cred) + { + if (false == CheckSubjectOfCertificate(cred, deviceID)) + { + OIC_LOG(WARNING, TAG, "Check subject of Certificate was failed while InitCredResource"); + } + if (false == IsValidCredential(cred)) + { + OIC_LOG(WARNING, TAG, "Invalid credential data was dectected while InitCredResource"); + OIC_LOG_V(WARNING, TAG, "Invalid credential ID = %d", cred->credId); + } + } + + if (0 == memcmp(&gCred->rownerID, &emptyUuid, sizeof(OicUuid_t))) + { + memcpy(&gCred->rownerID, &deviceID, sizeof(OicUuid_t)); + } + + if (!UpdatePersistentStorage(gCred)) + { + OIC_LOG(FATAL, TAG, "UpdatePersistentStorage failed!"); + } + } //Instantiate 'oic.sec.cred' ret = CreateCredResource(); + +exit: + OIC_LOG(DEBUG, TAG, "OUT InitCredResource."); + OICClearMemory(data, size); OICFree(data); return ret; } @@ -1646,22 +2370,81 @@ OicSecCred_t* GetCredResourceData(const OicUuid_t* subject) return NULL; } -OicSecCred_t* GetCredResourceDataByCredId(const uint16_t credId) +const OicSecCred_t* GetCredList() +{ + return gCred; +} + +OicSecCred_t* GetCredEntryByCredId(const uint16_t credId) { OicSecCred_t *cred = NULL; + OicSecCred_t *tmpCred = NULL; if ( 1 > credId) { return NULL; } - LL_FOREACH(gCred, cred) + LL_FOREACH(gCred, tmpCred) { - if(cred->credId == credId) + if(tmpCred->credId == credId) { + cred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t)); + VERIFY_NON_NULL(TAG, cred, ERROR); + + // common + cred->next = NULL; + cred->credId = tmpCred->credId; + cred->credType = tmpCred->credType; + memcpy(cred->subject.id, tmpCred->subject.id , sizeof(cred->subject.id)); + memcpy(cred->rownerID.id, tmpCred->rownerID.id , sizeof(cred->rownerID.id)); + if (tmpCred->period) + { + cred->period = OICStrdup(tmpCred->period); + } + + // key data + if (tmpCred->privateData.data) + { + cred->privateData.data = (uint8_t *)OICCalloc(1, tmpCred->privateData.len); + VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR); + + memcpy(cred->privateData.data, tmpCred->privateData.data, tmpCred->privateData.len); + cred->privateData.len = tmpCred->privateData.len; + cred->privateData.encoding = tmpCred->privateData.encoding; + } +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + if (tmpCred->publicData.data) + { + cred->publicData.data = (uint8_t *)OICCalloc(1, tmpCred->publicData.len); + VERIFY_NON_NULL(TAG, cred->publicData.data, ERROR); + + memcpy(cred->publicData.data, tmpCred->publicData.data, tmpCred->publicData.len); + cred->publicData.len = tmpCred->publicData.len; + cred->publicData.encoding = tmpCred->publicData.encoding; + } + if (tmpCred->optionalData.data) + { + cred->optionalData.data = (uint8_t *)OICCalloc(1, tmpCred->optionalData.len); + VERIFY_NON_NULL(TAG, cred->optionalData.data, ERROR); + + memcpy(cred->optionalData.data, tmpCred->optionalData.data, tmpCred->optionalData.len); + cred->optionalData.len = tmpCred->optionalData.len; + cred->optionalData.encoding = tmpCred->optionalData.encoding; + cred->optionalData.revstat= tmpCred->optionalData.revstat; + } + if (tmpCred->credUsage) + { + cred->credUsage = OICStrdup(tmpCred->credUsage); + } +#endif /* __WITH_DTLS__ or __WITH_TLS__*/ + return cred; } } + +exit: + FreeCred(cred); return NULL; } @@ -1740,7 +2523,7 @@ int32_t GetDtlsPskCredentials(CADtlsPskCredType_t type, uint32_t outKeySize; if(NULL == outKey) { - OIC_LOG (ERROR, TAG, "Failed to memoray allocation."); + OIC_LOG (ERROR, TAG, "Failed to allocate memory."); return ret; } @@ -1760,12 +2543,105 @@ int32_t GetDtlsPskCredentials(CADtlsPskCredType_t type, return ret; } } - } - break; + OIC_LOG(DEBUG, TAG, "Can not find subject matched credential."); - default: - { - OIC_LOG (ERROR, TAG, "Wrong value passed for CADtlsPskCredType_t."); +#ifdef MULTIPLE_OWNER + const OicSecDoxm_t* doxm = GetDoxmResourceData(); + if(doxm && doxm->mom && OIC_MULTIPLE_OWNER_DISABLE != doxm->mom->mode) + { + // in case of multiple owner transfer authentication + if(OIC_PRECONFIG_PIN == doxm->oxmSel) + { + OicSecCred_t* wildCardCred = GetCredResourceData(&WILDCARD_SUBJECT_ID); + if(wildCardCred) + { + OIC_LOG(DEBUG, TAG, "Detected wildcard credential."); + if(PIN_PASSWORD == wildCardCred->credType) + { + //Read PIN/PW + char* pinBuffer = NULL; + uint32_t pinLength = 0; + if(OIC_ENCODING_RAW == wildCardCred->privateData.encoding) + { + pinBuffer = OICCalloc(1, wildCardCred->privateData.len + 1); + if(NULL == pinBuffer) + { + OIC_LOG (ERROR, TAG, "Failed to allocate memory."); + return ret; + } + pinLength = wildCardCred->privateData.len; + memcpy(pinBuffer, wildCardCred->privateData.data, pinLength); + } + else if(OIC_ENCODING_BASE64 == wildCardCred->privateData.encoding) + { + size_t pinBufSize = B64DECODE_OUT_SAFESIZE((wildCardCred->privateData.len + 1)); + pinBuffer = OICCalloc(1, pinBufSize); + if(NULL == pinBuffer) + { + OIC_LOG (ERROR, TAG, "Failed to allocate memory."); + return ret; + } + + if(B64_OK != b64Decode((char*)wildCardCred->privateData.data, wildCardCred->privateData.len, pinBuffer, pinBufSize, &pinLength)) + { + OIC_LOG (ERROR, TAG, "Failed to base64 decoding."); + return ret; + } + } + else + { + OIC_LOG(ERROR, TAG, "Unknown encoding type of PIN/PW credential."); + return ret; + } + + //Set the PIN/PW to derive PSK + if (OC_STACK_OK != SetPreconfigPin(pinBuffer, pinLength)) + { + OICFree(pinBuffer); + OIC_LOG(ERROR, TAG, "Failed to load PIN data."); + return ret; + } + OICFree(pinBuffer); + + OicUuid_t myUuid; + if(OC_STACK_OK != GetDoxmDeviceID(&myUuid)) + { + OIC_LOG(ERROR, TAG, "Failed to read device ID"); + return ret; + } + SetUuidForPinBasedOxm(&myUuid); + + //Calculate PSK using PIN/PW + if(0 == DerivePSKUsingPIN((uint8_t*)result)) + { + ret = OWNER_PSK_LENGTH_128; + } + else + { + OIC_LOG_V(ERROR, TAG, "Failed to derive crypto key from PIN"); + } + + if(CA_STATUS_OK != CAregisterSslHandshakeCallback(MultipleOwnerDTLSHandshakeCB)) + { + OIC_LOG(WARNING, TAG, "Error while bind the DTLS Handshake Callback."); + } + } + } + } + else if(OIC_RANDOM_DEVICE_PIN == doxm->oxmSel) + { + if(0 == DerivePSKUsingPIN((uint8_t*)result)) + { + ret = OWNER_PSK_LENGTH_128; + } + else + { + OIC_LOG_V(ERROR, TAG, "Failed to derive crypto key from PIN : result"); + ret = -1; + } + } + } +#endif //MULTIPLE_OWNER } break; } @@ -1806,7 +2682,8 @@ OCStackResult AddTmpPskWithPIN(const OicUuid_t* tmpSubject, OicSecCredType_t cre VERIFY_SUCCESS(TAG, (0 == dtlsRes) , ERROR); cred = GenerateCredential(tmpSubject, credType, NULL, - &privKey, rownerID); + &privKey, rownerID, NULL); + OICClearMemory(privData, sizeof(privData)); if(NULL == cred) { OIC_LOG(ERROR, TAG, "GeneratePskWithPIN() : Failed to generate credential"); @@ -1818,7 +2695,7 @@ OCStackResult AddTmpPskWithPIN(const OicUuid_t* tmpSubject, OicSecCredType_t cre ret = AddCredential(cred); if( OC_STACK_OK != ret) { - RemoveCredential(tmpSubject); + FreeCred(cred); OIC_LOG(ERROR, TAG, "GeneratePskWithPIN() : Failed to add credential"); } OIC_LOG(DEBUG, TAG, "AddTmpPskWithPIN OUT"); @@ -1828,81 +2705,6 @@ exit: } #endif /* __WITH_DTLS__ */ -#ifdef __WITH_X509__ -#define CERT_LEN_PREFIX (3) -#define BYTE_SIZE (8) //bits -#define PUB_KEY_X_COORD ("x") -#define PUB_KEY_Y_COORD ("y") -#define CERTIFICATE ("x5c") -#define PRIVATE_KEY ("d") - -static uint32_t parseCertPrefix(uint8_t *prefix) -{ - uint32_t res = 0; - if (NULL != prefix) - { - for (int i = 0; i < CERT_LEN_PREFIX; ++i) - { - res |= (((uint32_t) prefix[i]) << ((CERT_LEN_PREFIX - 1 -i) * BYTE_SIZE)); - } - } - return res; -} - -static OCStackResult GetCAPublicKeyData(CADtlsX509Creds_t *credInfo) -{ - OCStackResult ret = OC_STACK_ERROR; - uint8_t *ccPtr = credInfo->certificateChain; - for (uint8_t i = 0; i < credInfo->chainLen - 1; ++i) - { - ccPtr += CERT_LEN_PREFIX + parseCertPrefix(ccPtr); - } - - ByteArray cert = { .data = ccPtr + CERT_LEN_PREFIX, .len = parseCertPrefix(ccPtr) }; - CertificateX509 certStruct; - - VERIFY_SUCCESS(TAG, PKI_SUCCESS == DecodeCertificate(cert, &certStruct), ERROR); - - INC_BYTE_ARRAY(certStruct.pubKey, 2); - - memcpy(credInfo->rootPublicKeyX, certStruct.pubKey.data, PUBLIC_KEY_SIZE / 2); - memcpy(credInfo->rootPublicKeyY, certStruct.pubKey.data + PUBLIC_KEY_SIZE / 2, PUBLIC_KEY_SIZE / 2); - - ret = OC_STACK_OK; - exit: - return ret; -} - -int GetDtlsX509Credentials(CADtlsX509Creds_t *credInfo) -{ - int ret = 1; - VERIFY_NON_NULL(TAG, credInfo, ERROR); - if (NULL == gCred) - { - VERIFY_SUCCESS(TAG, OC_STACK_OK == InitCredResource(), ERROR); - } - - OicSecCred_t *cred = NULL; - LL_SEARCH_SCALAR(gCred, cred, credType, SIGNED_ASYMMETRIC_KEY); - VERIFY_NON_NULL(TAG, cred, ERROR); - - if (cred->publicData.len > MAX_CERT_MESSAGE_LEN || cred->privateData.len > PRIVATE_KEY_SIZE) - { - goto exit; - } - credInfo->chainLen = 2; - memcpy(credInfo->certificateChain, cred->publicData.data, cred->publicData.len); - memcpy(credInfo->devicePrivateKey, cred->privateData.data, cred->privateData.len); - credInfo->certificateChainLen = cred->publicData.len; - GetCAPublicKeyData(credInfo); - ret = 0; - -exit: - - return ret; -} -#undef CERT_LEN_PREFIX -#endif /* __WITH_X509__ */ OCStackResult SetCredRownerId(const OicUuid_t* newROwner) { @@ -1926,7 +2728,6 @@ OCStackResult SetCredRownerId(const OicUuid_t* newROwner) memcpy(prevId.id, gCred->rownerID.id, sizeof(prevId.id)); memcpy(gCred->rownerID.id, newROwner->id, sizeof(newROwner->id)); - size_t credCnt = 0; // This added '256' is arbitrary value that is added to cover the name of the resource, map addition and ending size = GetCredKeyDataSize(gCred); size += (256 * OicSecCredCount(gCred)); @@ -1958,35 +2759,40 @@ OCStackResult GetCredRownerId(OicUuid_t *rowneruuid) return retVal; } -#ifdef __WITH_TLS__ -void GetDerCaCert(ByteArray * crt) +#if defined (__WITH_TLS__) || defined(__WITH_DTLS__) +void GetDerCaCert(ByteArray_t * crt, const char * usage) { - if (NULL == crt) + OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + if (NULL == crt || NULL == usage) { + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); return; } - uint8_t *data = NULL; crt->len = 0; - OCStackResult ret = OC_STACK_ERROR; - OicSecCred_t * cred; - OicSecCred_t * temp = NULL; - OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + OicSecCred_t* temp = NULL; + LL_FOREACH(gCred, temp) { - if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), TRUST_CA, sizeof(TRUST_CA))) + if ((SIGNED_ASYMMETRIC_KEY == temp->credType) && + (0 == strcmp(temp->credUsage, usage)) && (false == temp->optionalData.revstat)) { - OIC_LOG_V(DEBUG, TAG, "len: %d, crt len: %d", temp->optionalData.len, crt->len); if(OIC_ENCODING_BASE64 == temp->optionalData.encoding) { size_t bufSize = B64DECODE_OUT_SAFESIZE((temp->optionalData.len + 1)); - uint8 * buf = OICCalloc(1, bufSize); + uint8_t * buf = OICCalloc(1, bufSize); if(NULL == buf) { OIC_LOG(ERROR, TAG, "Failed to allocate memory"); return; } uint32_t outSize; - b64Decode(temp->optionalData.data, temp->optionalData.len, buf, bufSize, &outSize); + if(B64_OK != b64Decode((char*)(temp->optionalData.data), + temp->optionalData.len, buf, bufSize, &outSize)) + { + OICFree(buf); + OIC_LOG(ERROR, TAG, "Failed to decode base64 data"); + return; + } crt->data = OICRealloc(crt->data, crt->len + outSize); memcpy(crt->data + crt->len, buf, outSize); crt->len += outSize; @@ -1998,84 +2804,82 @@ void GetDerCaCert(ByteArray * crt) memcpy(crt->data + crt->len, temp->optionalData.data, temp->optionalData.len); crt->len += temp->optionalData.len; } - OIC_LOG_V(DEBUG, TAG, "Trust CA Found!! %d", crt->len); + OIC_LOG_V(DEBUG, TAG, "%s found", usage); } } if(0 == crt->len) { - OIC_LOG(DEBUG, TAG, "Trust CA Not Found!!"); + OIC_LOG_V(WARNING, TAG, "%s not found", usage); } OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); return; } -void GetDerOwnCert(ByteArray * crt) +void GetDerOwnCert(ByteArray_t * crt, const char * usage) { - if (NULL == crt) + OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + if (NULL == crt || NULL == usage) { + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); return; } crt->len = 0; - uint8_t *data = NULL; OicSecCred_t * temp = NULL; - OIC_LOG_V(DEBUG, TAG, "In %s", __func__); LL_FOREACH(gCred, temp) { - if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, sizeof(PRIMARY_CERT))) + if (SIGNED_ASYMMETRIC_KEY == temp->credType && + 0 == strcmp(temp->credUsage, usage)) { - OIC_LOG_V(DEBUG, TAG, "len: %d, crt len: %d", temp->publicData.len, crt->len); crt->data = OICRealloc(crt->data, crt->len + temp->publicData.len); memcpy(crt->data + crt->len, temp->publicData.data, temp->publicData.len); crt->len += temp->publicData.len; - - OIC_LOG_V(DEBUG, TAG, "Trust CA Found!! %d", crt->len); + OIC_LOG_V(DEBUG, TAG, "%s found", usage); } } if(0 == crt->len) { - OIC_LOG(DEBUG, TAG, "Trust CA Not Found!!"); + OIC_LOG_V(WARNING, TAG, "%s not found", usage); } OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); return; } -void GetDerKey(ByteArray * key) +void GetDerKey(ByteArray_t * key, const char * usage) { - if (NULL == key) + OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + if (NULL == key || NULL == usage) { + OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); return; } - uint8_t *data = NULL; OicSecCred_t * temp = NULL; key->len = 0; - OIC_LOG_V(DEBUG, TAG, "In %s", __func__); LL_FOREACH(gCred, temp) { - if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, sizeof(PRIMARY_CERT))) + if (SIGNED_ASYMMETRIC_KEY == temp->credType && + 0 == strcmp(temp->credUsage, usage)) { - OIC_LOG_V(DEBUG, TAG, "len: %d, key len: %d", temp->privateData.len, key->len); key->data = OICRealloc(key->data, key->len + temp->privateData.len); memcpy(key->data + key->len, temp->privateData.data, temp->privateData.len); key->len += temp->privateData.len; - - OIC_LOG_V(DEBUG, TAG, "Key Found!! %d", key->len); + OIC_LOG_V(DEBUG, TAG, "Key for %s found", usage); } } - if(0 == key->len) + if(0 == key->len) { - OIC_LOG(DEBUG, TAG, "Key Not Found!!"); + OIC_LOG_V(WARNING, TAG, "Key for %s not found", usage); } OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); } -void InitCipherSuiteList(bool * list) +void InitCipherSuiteListInternal(bool * list, const char * usage) { OIC_LOG_V(DEBUG, TAG, "In %s", __func__); - if (NULL == list) + if (NULL == list || NULL == usage) { + OIC_LOG(DEBUG, TAG, "NULL passed"); OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); - OIC_LOG(DEBUG, TAG, "NULL list param"); return; } OicSecCred_t * temp = NULL; @@ -2083,6 +2887,12 @@ void InitCipherSuiteList(bool * list) { switch (temp->credType) { + case PIN_PASSWORD: + { + list[0] = true; + OIC_LOG(DEBUG, TAG, "PIN_PASSWORD found"); + break; + } case SYMMETRIC_PAIR_WISE_KEY: { list[0] = true; @@ -2091,13 +2901,15 @@ void InitCipherSuiteList(bool * list) } case SIGNED_ASYMMETRIC_KEY: { - list[1] = true; - OIC_LOG(DEBUG, TAG, "SIGNED_ASYMMETRIC_KEY found"); + if (0 == strcmp(temp->credUsage, usage)) + { + list[1] = true; + OIC_LOG_V(DEBUG, TAG, "SIGNED_ASYMMETRIC_KEY found for %s", usage); + } break; } case SYMMETRIC_GROUP_KEY: case ASYMMETRIC_KEY: - case PIN_PASSWORD: case ASYMMETRIC_ENCRYPTION_KEY: { OIC_LOG(WARNING, TAG, "Unsupported credential type for TLS."); @@ -2105,7 +2917,7 @@ void InitCipherSuiteList(bool * list) } default: { - OIC_LOG(WARNING, TAG, "Unknow credential type for TLS."); + OIC_LOG(WARNING, TAG, "Unknown credential type for TLS."); break; } } @@ -2113,3 +2925,157 @@ void InitCipherSuiteList(bool * list) OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); } #endif + + +//Added as workaround by Chul Lee +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) +OCStackResult CredSaveTrustCertChain(const OicUuid_t* subject, uint8_t *trustCertChain, size_t chainSize, + OicEncodingType_t encodingType, const char* usage, uint16_t *credId) +{ + OIC_LOG_V(DEBUG, TAG, "IN %s", __func__); + + if(NULL == trustCertChain || NULL == credId || NULL == usage || NULL == subject) + { + OIC_LOG_V(ERROR, TAG, "Invaild param"); + return OC_STACK_INVALID_PARAM; + } + + OCStackResult res = OC_STACK_ERROR; + OicSecCred_t *cred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t)); + if(NULL == cred) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + cred->credId = 0; + memcpy(cred->subject.id, subject->id, sizeof(cred->subject.id)); + + cred->credUsage = OICStrdup(usage); + if (NULL == cred->credUsage) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + + cred->credType = SIGNED_ASYMMETRIC_KEY; + + if (encodingType == OIC_ENCODING_PEM) + { + cred->optionalData.data = (uint8_t *)OICCalloc(1, chainSize + 1); + if(NULL == cred->optionalData.data) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + cred->optionalData.len = chainSize + 1; + } + else + { + cred->optionalData.data = (uint8_t *)OICCalloc(1, chainSize); + if(NULL == cred->optionalData.data) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + cred->optionalData.len = chainSize; + } + memcpy(cred->optionalData.data, trustCertChain, chainSize); + cred->optionalData.encoding = encodingType; + cred->optionalData.revstat = false; + + res = AddCredential(cred); + if(res != OC_STACK_OK) + { + goto error; + } + *credId = cred->credId; + + OIC_LOG_V(DEBUG, TAG, "OUT %s", __func__); + + return res; + +error: + DeleteCredList(cred); + OIC_LOG_V(ERROR, TAG, "OUT %s : error = %d", __func__, (int)res); + return res; +} + +OCStackResult CredSaveOwnCert(const OicUuid_t* subject, OicSecKey_t * cert, OicSecKey_t * key, + const char* usage, uint16_t *credId) +{ + OIC_LOG_V(DEBUG, TAG, "IN %s", __func__); + + if(NULL == cert || NULL == cert->data || NULL == key || NULL == key->data || + NULL == credId || NULL == usage || NULL == subject) + { + OIC_LOG_V(ERROR, TAG, "Invalid param"); + return OC_STACK_INVALID_PARAM; + } + + OCStackResult res = OC_STACK_ERROR; + OicSecCred_t *cred = (OicSecCred_t *)OICCalloc(1, sizeof(OicSecCred_t)); + if(NULL == cred) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + cred->credId = 0; + memcpy(cred->subject.id, subject->id, sizeof(cred->subject.id)); + + cred->credUsage = OICStrdup(usage); + if (NULL == cred->credUsage) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + + cred->credType = SIGNED_ASYMMETRIC_KEY; + + OicSecKey_t *publicData = &cred->publicData; + publicData->data = (uint8_t *)OICCalloc(1, cert->len); + if(NULL == publicData->data) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + memcpy(publicData->data, cert->data, cert->len); + publicData->encoding = cert->encoding; + publicData->len = cert->len; + + OicSecKey_t *privateData = &cred->privateData; + privateData->data = (uint8_t *)OICCalloc(1, key->len); + if(NULL == privateData->data) + { + OIC_LOG_V(ERROR, TAG, "Failed to allocate memory"); + res = OC_STACK_NO_MEMORY; + goto error; + } + memcpy(privateData->data, key->data, key->len); + privateData->len = key->len; + privateData->encoding = key->encoding; + + res = AddCredential(cred); + if(res != OC_STACK_OK) + { + goto error; + } + *credId = cred->credId; + + OIC_LOG_V(DEBUG, TAG, "OUT %s", __func__); + + return res; + +error: + DeleteCredList(cred); + OIC_LOG_V(ERROR, TAG, "OUT %s : error = %d", __func__, (int)res); + return res; +} + +#endif // defined(__WITH_DTLS__) || defined(__WITH_TLS__)