[IOT-2105] Removing undocumented property oxmtypes from doxm

[patch 2] Retrigger jenkins

Change-Id: I2fc90f3814471ad6c0961b3d6266dc1a04fe1fc3
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19703
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/security/include/internal/doxmresource.h b/resource/csdk/security/include/internal/doxmresource.h
index 7e0b3a5c9bb786ae1e894747d3e7b6f9223a36dc..fc2693dc7f1abbbf78986a39bcb4ffa69d58589e 100644 (file)
--- a/resource/csdk/security/include/internal/doxmresource.h
+++ b/resource/csdk/security/include/internal/doxmresource.h
@@ -33,8 +33,7 @@ extern "C" {
 // NOTE that this enum must match the gDoxmPropertyAccessModes
 // table in doxmresource.c
 typedef enum {
-    DOXM_OXMTYPE = 0, // TODO [IOT-2105]
-    DOXM_OXMS,
+    DOXM_OXMS = 1,
     DOXM_OXMSEL,
     DOXM_SCT,
     DOXM_OWNED,

diff --git a/resource/csdk/security/include/securevirtualresourcetypes.h b/resource/csdk/security/include/securevirtualresourcetypes.h
index b695844deba65e5a3d8e530308dd71cbe0099c6f..221029538080a05eb02d0dc6f3b3b78409f0742e 100644 (file)
--- a/resource/csdk/security/include/securevirtualresourcetypes.h
+++ b/resource/csdk/security/include/securevirtualresourcetypes.h
@@ -590,8 +590,6 @@ struct OicSecMom{
 struct OicSecDoxm
 {
     // <Attribute ID>:<Read/Write>:<Multiple/Single>:<Mandatory?>:<Type>
-    OicUrn_t            *oxmType;       // 0:R:M:N:URN TODO [IOT-2105]
-    size_t              oxmTypeLen;     // the number of elts in OxmType
     OicSecOxm_t         *oxm;           // 1:R:M:N:UINT16
     size_t              oxmLen;         // the number of elts in Oxm
     OicSecOxm_t         oxmSel;         // 2:R/W:S:Y:UINT16

diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index e53469eb9081a92621e7b3f64c1bb828e9352d32..01fc615434aa7817401e21da3afcabf72e442ae3 100644 (file)
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -225,8 +225,6 @@ OicSecDoxm_t* CloneOicSecDoxm(const OicSecDoxm_t* src)
 #endif //MULTIPLE_OWNER
 
     // We have to assign NULL for not necessary information to prevent memory corruption.
-    newDoxm->oxmType = NULL;
-    newDoxm->oxmTypeLen = 0;
     newDoxm->oxm = NULL;
     newDoxm->oxmLen = 0;
 

diff --git a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
index 1c56b214fc052134a470c2f748fc6c182eb4131a..51695678b48e83ed0aa2106262c492bc85383f8f 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
+++ b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
@@ -29,8 +29,6 @@ static OicSecOxm_t oicSecDoxmJustWorks = OIC_JUST_WORKS;
 static OicSecOxm_t oicSecDoxmRandomPin = OIC_RANDOM_DEVICE_PIN;
 static OicSecDoxm_t defaultDoxm1 =
 {
-    NULL,                   /* OicUrn_t *oxmType */
-    0,                      /* size_t oxmTypeLen */
     &oicSecDoxmJustWorks,  /* uint16_t *oxm */
     1,                      /* size_t oxmLen */
     OIC_JUST_WORKS,         /* uint16_t oxmSel */
@@ -48,8 +46,6 @@ static OicSecDoxm_t defaultDoxm1 =
 
 static OicSecDoxm_t defaultDoxm2 =
 {
-    NULL,                   /* OicUrn_t *oxmType */
-    0,                      /* size_t oxmTypeLen */
     &oicSecDoxmRandomPin,   /* uint16_t *oxm */
     1,                      /* size_t oxmLen */
     OIC_RANDOM_DEVICE_PIN,  /* uint16_t oxmSel */

diff --git a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
index 4cc20c3764431fa385898c93146a9e959e388078..a2e53770d4c594e86960a5c949aed84275743cad 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
+++ b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
@@ -289,13 +289,6 @@ private:
         result->oxm[0] = OIC_JUST_WORKS;
         result->oxmLen = 1U;
         result->oxmSel = OIC_JUST_WORKS;
-        result->oxmType = (OicUrn_t*)OICCalloc(1, sizeof(OicUrn_t));
-        if (NULL == result->oxmType)
-        {
-            return NULL;
-        }
-        result->oxmType[0] = NULL;
-        result->oxmTypeLen = 1U;
         memcpy(&result->rownerID, &s_sampleOwnerId, sizeof(result->rownerID));
         result->sct = NO_SECURITY_MODE;
 
@@ -334,22 +327,6 @@ TEST_F(CloneOicSecDoxmTest, shouldReturnValidPointerForValidInput)
     EXPECT_FALSE(NULL == m_clonedStruct);
 }
 
-TEST_F(CloneOicSecDoxmTest, copyShouldHaveNulledOxmType)
-{
-    ASSERT_FALSE(NULL == m_originalStruct->oxmType);
-
-    m_clonedStruct = CloneOicSecDoxm(m_originalStruct);
-    EXPECT_TRUE(NULL == m_clonedStruct->oxmType);
-}
-
-TEST_F(CloneOicSecDoxmTest, copyShouldHaveZeroedOxmTypeLen)
-{
-    ASSERT_NE(0U, m_originalStruct->oxmTypeLen);
-
-    m_clonedStruct = CloneOicSecDoxm(m_originalStruct);
-    EXPECT_EQ(0U, m_clonedStruct->oxmTypeLen);
-}
-
 TEST_F(CloneOicSecDoxmTest, copyShouldHaveNulledOxm)
 {
     ASSERT_FALSE(NULL == m_originalStruct->oxm);
@@ -583,4 +560,4 @@ TEST(ProvisionListTest, Deletion)
 
     LL_FOREACH(gList,el){ ++cnt; };
     EXPECT_TRUE(0 == cnt);
-}
\ No newline at end of file
+}

diff --git a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
index e34f8fe373df13229dbc0541ffb30e07b71606fc..764bc645dfcfbcbada40b81b1000ca4bba9094f7 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
+++ b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
@@ -31,8 +31,6 @@ static OicSecOxm_t oicSecDoxmRandomPin = OIC_RANDOM_DEVICE_PIN;
 static unsigned short timeout = 60;
 static OicSecDoxm_t defaultDoxm1 =
 {
-    NULL,                   /* OicUrn_t *oxmType */
-    0,                      /* size_t oxmTypeLen */
     &oicSecDoxmJustWorks,   /* uint16_t *oxm */
     1,                      /* size_t oxmLen */
     OIC_JUST_WORKS,         /* uint16_t oxmSel */
@@ -50,8 +48,6 @@ static OicSecDoxm_t defaultDoxm1 =
 
 static OicSecDoxm_t defaultDoxm2 =
 {
-    NULL,                   /* OicUrn_t *oxmType */
-    0,                      /* size_t oxmTypeLen */
     &oicSecDoxmRandomPin,   /* uint16_t *oxm */
     1,                      /* size_t oxmLen */
     OIC_RANDOM_DEVICE_PIN,  /* uint16_t oxmSel */

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 40737c33013308f9dec26437bded95f8a6f61aea..38a43bf4c8f2590bef70a2d5b90b30b76d3ba74b 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -83,8 +83,6 @@ static OCResourceHandle    gDoxmHandle = NULL;
 static OicSecOxm_t gDoxmDefaultOxm = OIC_RANDOM_DEVICE_PIN;
 static OicSecDoxm_t gDefaultDoxm =
 {
-    NULL,                   /* OicUrn_t *oxmType */
-    0,                      /* size_t oxmTypeLen */
     &gDoxmDefaultOxm,       /* uint16_t *oxm */
     1,                      /* size_t oxmLen */
     OIC_RANDOM_DEVICE_PIN,  /* uint16_t oxmSel */
@@ -161,13 +159,6 @@ void DeleteDoxmBinData(OicSecDoxm_t* doxm)
 {
     if (doxm)
     {
-        //Clean oxmType
-        for (size_t i = 0; i < doxm->oxmTypeLen; i++)
-        {
-            OICFree(doxm->oxmType[i]);
-        }
-        OICFree(doxm->oxmType);
-
         //clean oxm
         OICFree(doxm->oxm);
 
@@ -224,28 +215,6 @@ OCStackResult DoxmToCBORPayloadPartial(const OicSecDoxm_t *doxm,
     cborEncoderResult = cbor_encoder_create_map(&encoder, &doxmMap, CborIndefiniteLength);
     VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Doxm Map.");
 
-    // oxmtype
-    // TODO [IOT-2105]: resolve "oxmtype" undocumented tag/value
-    if (propertiesToInclude[DOXM_OXMTYPE] && doxm->oxmTypeLen > 0)
-    {
-        OIC_LOG_V(DEBUG, TAG, "%s: including %s.", __func__, OIC_JSON_OXM_TYPE_NAME);
-        CborEncoder oxmType;
-        cborEncoderResult = cbor_encode_text_string(&doxmMap, OIC_JSON_OXM_TYPE_NAME,
-            strlen(OIC_JSON_OXM_TYPE_NAME));
-        VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding oxmtype Tag.");
-        cborEncoderResult = cbor_encoder_create_array(&doxmMap, &oxmType, doxm->oxmTypeLen);
-        VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding oxmtype Array.");
-
-        for (size_t i = 0; i < doxm->oxmTypeLen; i++)
-        {
-            cborEncoderResult = cbor_encode_text_string(&oxmType, doxm->oxmType[i],
-                strlen(doxm->oxmType[i]));
-            VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding oxmtype Value.");
-        }
-        cborEncoderResult = cbor_encoder_close_container(&doxmMap, &oxmType);
-        VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Closing oxmtype.");
-    }
-
     // oxms Property
     if (propertiesToInclude[DOXM_OXMS] && doxm->oxmLen > 0)
     {
@@ -467,8 +436,6 @@ OCStackResult DoxmToCBORPayload(const OicSecDoxm_t *doxm,
         allProps[i] = true;
     }
 
-    allProps[DOXM_OXMTYPE] = false; // TODO [IOT-2105]: resolve "oxmtype" undocumented tag/value
-
     return DoxmToCBORPayloadPartial(doxm, payload, size, allProps);
 }
 
@@ -501,38 +468,6 @@ static OCStackResult CBORPayloadToDoxmBin(const uint8_t *cborPayload, size_t siz
     OicSecDoxm_t *doxm = (OicSecDoxm_t *)OICCalloc(1, sizeof(*doxm));
     VERIFY_NOT_NULL(TAG, doxm, ERROR);
 
-    cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_OXM_TYPE_NAME, &doxmMap);
-    // OxmType
-    // TODO [IOT-2105]: resolve "oxmtype" undocumented tag/value
-    if (CborNoError == cborFindResult && cbor_value_is_array(&doxmMap))
-    {
-        OIC_LOG(DEBUG, TAG, "Found doxm.oxmtype tag in doxmMap.");
-
-        CborValue oxmType;
-
-        cborFindResult = cbor_value_get_array_length(&doxmMap, &doxm->oxmTypeLen);
-        VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding oxmTypeLen.");
-        VERIFY_SUCCESS(TAG, doxm->oxmTypeLen != 0, ERROR);
-
-        doxm->oxmType = (OicUrn_t *)OICCalloc(doxm->oxmTypeLen, sizeof(*doxm->oxmType));
-        VERIFY_NOT_NULL(TAG, doxm->oxmType, ERROR);
-
-        cborFindResult = cbor_value_enter_container(&doxmMap, &oxmType);
-        VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Entering oxmType Array.")
-
-        int i = 0;
-        size_t oxmTypeStrlen = 0;
-        while (cbor_value_is_valid(&oxmType) && cbor_value_is_text_string(&oxmType))
-        {
-            OIC_LOG_V(DEBUG, TAG, "Read doxm.oxmtype value = %s", oxmType);
-            cborFindResult = cbor_value_dup_text_string(&oxmType, &doxm->oxmType[i++],
-                                                        &oxmTypeStrlen, NULL);
-            VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding omxType text string.");
-            cborFindResult = cbor_value_advance(&oxmType);
-            VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Advancing oxmType.");
-        }
-    }
-
     cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_OXMS_NAME, &doxmMap);
 
     // oxms
@@ -2418,35 +2353,8 @@ bool AreDoxmBinPropertyValuesEqual(OicSecDoxm_t* doxm1, OicSecDoxm_t* doxm2)
         return false;
     }
 
-    //Compare the contents of the oxmType array and its length oxmTypeLen.
-    size_t arrayLength = doxm1->oxmTypeLen;
-
-    if (arrayLength != doxm2->oxmTypeLen)
-    {
-        OIC_LOG_V(ERROR, TAG, "%s: oxmTypeLen mismatch: (%" PRIuPTR ", %" PRIuPTR ")",
-            __func__, arrayLength, doxm2->oxmTypeLen);
-        return false;
-    }
-
-    for (size_t i = 0; i < arrayLength; i++)
-    {
-        if (NULL == doxm1->oxmType[i] || NULL == doxm2->oxmType[i])
-        {
-            OIC_LOG_V(ERROR, TAG, "%s: unexpected NULL found in the oxmType array",
-                __func__);
-            return false;
-        }
-
-        if (0 != strcmp(doxm1->oxmType[i], doxm2->oxmType[i]))
-        {
-            OIC_LOG_V(ERROR, TAG, "%s: oxmType mismatch: (%s, %s)",
-                __func__, doxm1->oxmType[i], doxm2->oxmType[i]);
-            return false;
-        }
-    }
-
     //Compare the contents of the oxm array and its length oxmLen.
-    arrayLength = doxm1->oxmLen;
+    size_t arrayLength = doxm1->oxmLen;
 
     if (arrayLength != doxm2->oxmLen)
     {
@@ -2459,7 +2367,7 @@ bool AreDoxmBinPropertyValuesEqual(OicSecDoxm_t* doxm1, OicSecDoxm_t* doxm2)
     {
         if (doxm1->oxm[i] != doxm2->oxm[i])
         {
-            OIC_LOG_V(ERROR, TAG, "%s: oxmType mismatch: (%u, %u)",
+            OIC_LOG_V(ERROR, TAG, "%s: oxm mismatch: (%u, %u)",
                 __func__, (uint32_t)doxm1->oxm[i], (uint32_t)doxm2->oxm[i]);
             return false;
         }

diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c
index 9cfbcc3da72071893a064fd6f0ed8ee61cecf21e..2bd5eb8db1d589bad62ca11e0c0e961064cc9249 100644 (file)
--- a/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@ -117,8 +117,6 @@ const char * OIC_JSON_OXMS_NAME = "oxms";
 #ifdef MULTIPLE_OWNER
 const char * OIC_JSON_MOM_NAME = "x.org.iotivity.mom";
 #endif //MULTIPLE_OWNER
-// TODO [IOT-2105]: resolve "oxmtype" undocumented tag/value
-const char * OIC_JSON_OXM_TYPE_NAME = "oxmtype"; // TODO [IOT-2105]
 const char * OIC_JSON_OXM_SEL_NAME = "oxmsel";
 const char * OIC_JSON_DEVICE_ID_FORMAT_NAME = "didformat";
 const char * OIC_JSON_ISOP_NAME = "isop";

diff --git a/resource/csdk/security/tool/json2cbor.c b/resource/csdk/security/tool/json2cbor.c
index 972dec198235e13ed2ca59031d91d2670635ce08..978e026dd40aa015d2705f931236c3ccce2a8c84 100644 (file)
--- a/resource/csdk/security/tool/json2cbor.c
+++ b/resource/csdk/security/tool/json2cbor.c
@@ -716,8 +716,6 @@ OicSecDoxm_t* JSONToDoxmBin(const char * jsonStr)
     cJSON *jsonDoxm = NULL;
     cJSON *jsonObj = NULL;
 
-    size_t jsonObjLen = 0;
-
     cJSON *jsonRoot = cJSON_Parse(jsonStr);
     VERIFY_NOT_NULL(TAG, jsonRoot, ERROR);
 
@@ -727,36 +725,6 @@ OicSecDoxm_t* JSONToDoxmBin(const char * jsonStr)
     doxm = (OicSecDoxm_t *)OICCalloc(1, sizeof(OicSecDoxm_t));
     VERIFY_NOT_NULL(TAG, doxm, ERROR);
 
-    //OxmType -- not Mandatory
-    jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_OXM_TYPE_NAME);
-    if ((jsonObj) && (cJSON_Array == jsonObj->type))
-    {
-        doxm->oxmTypeLen = cJSON_GetArraySize(jsonObj);
-        VERIFY_SUCCESS(TAG, doxm->oxmTypeLen > 0, ERROR);
-
-        doxm->oxmType = (OicUrn_t *)OICCalloc(doxm->oxmTypeLen, sizeof(char *));
-        VERIFY_NOT_NULL(TAG, (doxm->oxmType), ERROR);
-
-        for (size_t i  = 0; i < doxm->oxmTypeLen ; i++)
-        {
-// Needs to be removed once IOT-1746 is resolved.
-#ifdef _MSC_VER
-#pragma warning(suppress : 4267)
-            cJSON *jsonOxmTy = cJSON_GetArrayItem(jsonObj, i);
-
-#else
-            cJSON *jsonOxmTy = cJSON_GetArrayItem(jsonObj, i);
-
-#endif
-            VERIFY_NOT_NULL(TAG, jsonOxmTy, ERROR);
-
-            jsonObjLen = strlen(jsonOxmTy->valuestring) + 1;
-            doxm->oxmType[i] = (char*)OICMalloc(jsonObjLen);
-            VERIFY_NOT_NULL(TAG, doxm->oxmType[i], ERROR);
-            strncpy((char *)doxm->oxmType[i], (char *)jsonOxmTy->valuestring, jsonObjLen);
-        }
-    }
-
     //Oxm -- not Mandatory
     jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_OXMS_NAME);
     if (jsonObj && cJSON_Array == jsonObj->type)

diff --git a/resource/csdk/security/unittest/doxmresource.cpp b/resource/csdk/security/unittest/doxmresource.cpp
index 44bd187809cf21f6b26383d2fa42d4e05ee27c3b..482de2c4e66c68a5bc88470217100a9a6651d640 100644 (file)
--- a/resource/csdk/security/unittest/doxmresource.cpp
+++ b/resource/csdk/security/unittest/doxmresource.cpp
@@ -39,28 +39,11 @@ OicSecDoxm_t * getBinDoxm()
     {
         return NULL;
     }
-    doxm->oxmTypeLen =  1;
-    doxm->oxmType = (OicUrn_t *)OICCalloc(doxm->oxmTypeLen, sizeof(*doxm->oxmType));
-    if (!doxm->oxmType)
-    {
-        OICFree(doxm);
-        return NULL;
-    }
-    doxm->oxmType[0] = (char *) OICMalloc(strlen(OXM_JUST_WORKS) + 1);
-    if (!doxm->oxmType[0])
-    {
-        OICFree(doxm->oxmType);
-        OICFree(doxm);
-        return NULL;
-    }
 
-    OICStrcpy(doxm->oxmType[0], strlen(OXM_JUST_WORKS) + 1, OXM_JUST_WORKS);
     doxm->oxmLen     = 1;
     doxm->oxm        = (OicSecOxm_t *)OICCalloc(doxm->oxmLen, sizeof(OicSecOxm_t));
     if(!doxm->oxm)
     {
-        OICFree(doxm->oxmType[0]);
-        OICFree(doxm->oxmType);
         OICFree(doxm);
         return NULL;
     }
@@ -194,10 +177,6 @@ TEST(DoxmResourceTest, CBORPayloadToDoxmVALID)
     OicSecDoxm_t *doxmSec = NULL;
     EXPECT_EQ(OC_STACK_OK, CBORPayloadToDoxm(payload, size, &doxmSec));
     ASSERT_TRUE(doxmSec != NULL);
-    // TODO [IOT-2105]: resolve "oxmtype" undocumented tag/value
-    // EXPECT_EQ(doxmSec->oxmTypeLen, doxm->oxmTypeLen);
-    // EXPECT_STREQ(doxmSec->oxmType[0], doxm->oxmType[0]);
-    EXPECT_EQ(doxmSec->oxmLen, doxm->oxmLen);
     EXPECT_EQ(doxmSec->oxm[0], doxm->oxm[0]);
     EXPECT_EQ(doxmSec->oxmSel, doxm->oxmSel);
     EXPECT_EQ(doxmSec->sct, doxm->sct);
@@ -240,7 +219,6 @@ typedef struct _DoxmMotParameters
 
 typedef struct _DoxmTestParameter
 {
-    std::vector<std::string>        m_oxmTypeArray;
     std::vector<OicSecOxm_t>        m_oxmArray;
     OicSecOxm_t                     m_oxmSel;
     OicSecCredType_t                m_sct;
@@ -295,27 +273,8 @@ void DoxmComparisonTests::DoxmBinFromParameter(const DoxmTestParameter &param, O
     OicSecDoxm_t *newDoxmBin = (OicSecDoxm_t *)OICCalloc(1, sizeof(OicSecDoxm_t));
     ASSERT_NE(nullptr, newDoxmBin);
 
-    // oxmType and oxmTypeLen.
-    size_t arrayLength = param.m_oxmTypeArray.size();
-    if (arrayLength == 0)
-    {
-        newDoxmBin->oxmType = nullptr;
-    }
-    else
-    {
-        newDoxmBin->oxmType = (OicUrn_t *)OICCalloc(sizeof(OicUrn_t), arrayLength);
-        ASSERT_NE(nullptr, newDoxmBin->oxmType);
-
-        for (size_t i = 0; i < arrayLength; i++)
-        {
-            newDoxmBin->oxmType[i] = OICStrdup(param.m_oxmTypeArray[i].c_str());
-            ASSERT_NE(nullptr, newDoxmBin->oxmType[i]);
-        }
-    }
-    newDoxmBin->oxmTypeLen = arrayLength;
-
     // oxm and oxmLen.
-    arrayLength = param.m_oxmArray.size();
+    size_t arrayLength = param.m_oxmArray.size();
     if (arrayLength == 0)
     {
         newDoxmBin->oxm = nullptr;
@@ -373,7 +332,6 @@ TEST_F(DoxmComparisonTests, Equal1)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -411,7 +369,6 @@ TEST_F(DoxmComparisonTests, Equal2)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType10"},
         {OIC_RANDOM_DEVICE_PIN, OIC_JUST_WORKS},
         OIC_RANDOM_DEVICE_PIN,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -443,7 +400,6 @@ TEST_F(DoxmComparisonTests, Equal3)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType10", "oxmType20"},
         {OIC_RANDOM_DEVICE_PIN, OIC_JUST_WORKS},
         OIC_RANDOM_DEVICE_PIN,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -470,7 +426,6 @@ TEST_F(DoxmComparisonTests, Equal4)
 {
     DoxmTestParameter param1 =
     {
-        {"oxmType100"},
         {OIC_RANDOM_DEVICE_PIN, OIC_JUST_WORKS},
         OIC_RANDOM_DEVICE_PIN,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -497,7 +452,6 @@ TEST_F(DoxmComparisonTests, Equal5)
 {
     DoxmTestParameter param1 =
     {
-        {"oxmType100", "foo"},
         {OIC_RANDOM_DEVICE_PIN, OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_GROUP_KEY,
@@ -524,7 +478,6 @@ TEST_F(DoxmComparisonTests, Equal6)
 {
     DoxmTestParameter param1 =
     {
-        {"type", "bar", "Fred"},
         {OIC_MANUFACTURER_CERTIFICATE},
         OIC_JUST_WORKS,
         SYMMETRIC_GROUP_KEY,
@@ -547,69 +500,10 @@ TEST_F(DoxmComparisonTests, Equal6)
     EXPECT_TRUE(AreDoxmBinPropertyValuesEqual(m_doxm1, m_doxm2));
 }
 
-TEST_F(DoxmComparisonTests, oxmTypeMismatch)
-{
-    DoxmTestParameter param1 =
-    {
-        {"type", "bar", "Fred"},
-        {OIC_MANUFACTURER_CERTIFICATE},
-        OIC_JUST_WORKS,
-        SYMMETRIC_GROUP_KEY,
-        false,
-        {0},    // m_deviceID
-        true,
-        {0},    // m_owner
-
-#ifdef MULTIPLE_OWNER
-        {},
-        OIC_MULTIPLE_OWNER_ENABLE,
-#endif
-        {0}     // m_rownerID
-    };
-    GenerateDoxmTestParameterUUIDs(&param1);
-
-    DoxmTestParameter param2 = param1;
-    param2.m_oxmTypeArray[1] = "foo";
-
-    DoxmBinFromParameters(param1, param2);
-
-    EXPECT_FALSE(AreDoxmBinPropertyValuesEqual(m_doxm1, m_doxm2));
-}
-
-TEST_F(DoxmComparisonTests, oxmTypeLenMismatch)
-{
-    DoxmTestParameter param1 =
-    {
-        {"type1", "type2", "type3", "type4", "type5"},
-        {OIC_MANUFACTURER_CERTIFICATE},
-        OIC_JUST_WORKS,
-        SYMMETRIC_GROUP_KEY,
-        false,
-        {0},    // m_deviceID
-        true,
-        {0},    // m_owner
-
-#ifdef MULTIPLE_OWNER
-        {},
-        OIC_MULTIPLE_OWNER_ENABLE,
-#endif
-        {0}     // m_rownerID
-    };
-    GenerateDoxmTestParameterUUIDs(&param1);
-
-    DoxmTestParameter param2 = param1;
-    param2.m_oxmTypeArray.erase(param2.m_oxmTypeArray.begin());
-
-    DoxmBinFromParameters(param1, param2);
-
-    EXPECT_FALSE(AreDoxmBinPropertyValuesEqual(m_doxm1, m_doxm2));
-}
-
 TEST_F(DoxmComparisonTests, oxmMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"test oxmtype"},
         {OIC_MANUFACTURER_CERTIFICATE},
         OIC_JUST_WORKS,
         SYMMETRIC_GROUP_KEY,
@@ -638,7 +532,6 @@ TEST_F(DoxmComparisonTests, oxmLenMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"test oxmtype"},
         {OIC_MANUFACTURER_CERTIFICATE},
         OIC_JUST_WORKS,
         SYMMETRIC_GROUP_KEY,
@@ -667,7 +560,6 @@ TEST_F(DoxmComparisonTests, oxmSelMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"oxmtype1"},
         {OIC_MANUFACTURER_CERTIFICATE, OIC_JUST_WORKS, OIC_DECENTRALIZED_PUBLIC_KEY, OIC_RANDOM_DEVICE_PIN},
         OIC_RANDOM_DEVICE_PIN,
         SYMMETRIC_GROUP_KEY,
@@ -696,7 +588,6 @@ TEST_F(DoxmComparisonTests, sctMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"oxmtype10000"},
         {OIC_MANUFACTURER_CERTIFICATE, OIC_JUST_WORKS, OIC_DECENTRALIZED_PUBLIC_KEY, OIC_RANDOM_DEVICE_PIN},
         OIC_RANDOM_DEVICE_PIN,
         ASYMMETRIC_KEY,
@@ -725,7 +616,6 @@ TEST_F(DoxmComparisonTests, ownedMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"oxmtype10000"},
         {OIC_MANUFACTURER_CERTIFICATE, OIC_JUST_WORKS, OIC_DECENTRALIZED_PUBLIC_KEY, OIC_RANDOM_DEVICE_PIN},
         OIC_RANDOM_DEVICE_PIN,
         ASYMMETRIC_KEY,
@@ -754,7 +644,6 @@ TEST_F(DoxmComparisonTests, deviceIDMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"Jack", "in", "The", "Box"},
         {OIC_MANUFACTURER_CERTIFICATE, OIC_DECENTRALIZED_PUBLIC_KEY, OIC_RANDOM_DEVICE_PIN},
         OIC_MANUFACTURER_CERTIFICATE,
         PIN_PASSWORD,
@@ -783,7 +672,6 @@ TEST_F(DoxmComparisonTests, dpcMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"Jack", "in", "The", "Box"},
         {OIC_MANUFACTURER_CERTIFICATE, OIC_DECENTRALIZED_PUBLIC_KEY, OIC_RANDOM_DEVICE_PIN},
         OIC_MANUFACTURER_CERTIFICATE,
         PIN_PASSWORD,
@@ -812,7 +700,6 @@ TEST_F(DoxmComparisonTests, ownerMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"dpcMismatch test"},
         {OIC_RANDOM_DEVICE_PIN},
         OIC_RANDOM_DEVICE_PIN,
         PIN_PASSWORD,
@@ -841,7 +728,6 @@ TEST_F(DoxmComparisonTests, rownerIDMismatch)
 {
     DoxmTestParameter param1 =
     {
-        {"abc"},
         {OIC_JUST_WORKS, OIC_RANDOM_DEVICE_PIN},
         OIC_JUST_WORKS,
         ASYMMETRIC_KEY,
@@ -874,7 +760,6 @@ TEST_F(DoxmComparisonTests, subOwnersLengthMismatch1)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -909,7 +794,6 @@ TEST_F(DoxmComparisonTests, subOwnersLengthMismatch2)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -944,7 +828,6 @@ TEST_F(DoxmComparisonTests, subOwnerIDMismatch)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -976,7 +859,6 @@ TEST_F(DoxmComparisonTests, subOwnerStateMismatch)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -1010,7 +892,6 @@ TEST_F(DoxmComparisonTests, subOwnerMomMismatch)
 
     DoxmTestParameter param1 =
     {
-        {"oxmType1"},
         {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
@@ -1036,8 +917,7 @@ TEST_F(DoxmComparisonTests, createMom)
 {
     DoxmTestParameter param1 =
     {
-        { "oxmType1" },
-        { OIC_JUST_WORKS },
+        {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
         false,
@@ -1066,8 +946,7 @@ TEST_F(DoxmComparisonTests, updateMomEnable)
 {
     DoxmTestParameter param1 =
     {
-        { "oxmType1" },
-        { OIC_JUST_WORKS },
+        {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
         false,
@@ -1098,8 +977,7 @@ TEST_F(DoxmComparisonTests, updateMomDisable)
 {
     DoxmTestParameter param1 =
     {
-        { "oxmType1" },
-        { OIC_JUST_WORKS },
+        {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
         false,
@@ -1130,8 +1008,7 @@ TEST_F(DoxmComparisonTests, updateMomEnableDisable)
 {
     DoxmTestParameter param1 =
     {
-        { "oxmType1" },
-        { OIC_JUST_WORKS },
+        {OIC_JUST_WORKS},
         OIC_JUST_WORKS,
         SYMMETRIC_PAIR_WISE_KEY,
         false,