Remove x.org.iotivity from secure resources

Remove x.org.iotivity from IoTivity secure resources

Patch #1: Initial upload

Change-Id: Icb067cc8a44d365665ef26e3955f6f79fa12415c
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat b/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat
old mode 100755 (executable)
new mode 100644 (file)
index 4b5b918..91be3ca
Binary files a/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat and b/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat differ

diff --git a/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json b/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
old mode 100755 (executable)
new mode 100644 (file)
index 09cc117..03bca8c
--- a/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
+++ b/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
@@ -75,7 +75,6 @@
         "sct": 1,\r
         "owned": true,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
-        "x.org.iotivity.dpc": false,\r
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     }\r

diff --git a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat
index 6b67286ce2e4ddf55c29183e961f51756f1bbc63..f3cf369efff774700b109b89752429a4cde4615c 100644 (file)
Binary files a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat and b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat differ

diff --git a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
index 859aeb64451efd0d11663c24237409dff94bf187..29fd2bd9960d48e9683ff6b11b038f4aac6f6f28 100644 (file)
--- a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
+++ b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
@@ -63,7 +63,6 @@
         "sct": 1,\r
         "owned": true,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
-        "x.org.iotivity.dpc": false,\r
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     }\r

diff --git a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat
index c6c73ed4571712475f1f1e62f04ed77c4a82d82b..3a61974c70fb07f37b6621f58ac1e25478096e54 100644 (file)
Binary files a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat and b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat differ

diff --git a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
index a320bcc0cddbbcb0bab77a95eccd89900a11b76f..0cce3d9c48dd67b31a7b2554ad1b1dd4ea759015 100644 (file)
--- a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
+++ b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
@@ -64,8 +64,7 @@
         "owned": true,\r
         "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat
index b5eae8faf92f96df4932d6436b8ebbd5604cf3fa..1c6c9e12ed65a00387217eaf838a1d94f0e22096 100644 (file)
Binary files a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat and b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat differ

diff --git a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
index 58fd0733e90fc14b9821cdafc5cdf9da35606a69..776cccd717b1d28b3dac322de09ff81c95793fd2 100644 (file)
--- a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
+++ b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
@@ -94,8 +94,7 @@
         "owned": true,\r
         "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/csdk/security/provisioning/sample/cloud.dat b/resource/csdk/security/provisioning/sample/cloud.dat
index bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/cloud.dat and b/resource/csdk/security/provisioning/sample/cloud.dat differ

diff --git a/resource/csdk/security/provisioning/sample/cloud.json b/resource/csdk/security/provisioning/sample/cloud.json
index 91b6582ad49883a01fa72cc6d0c11390f0a91df5..7f6e747ab4c2c658387d6c7d330d139c4e738522 100644 (file)
--- a/resource/csdk/security/provisioning/sample/cloud.json
+++ b/resource/csdk/security/provisioning/sample/cloud.json
@@ -61,7 +61,6 @@
         "sct": 1,
         "owned": true,
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
-        "x.org.iotivity.dpc": false,
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
     }

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
index c8a6af4d47f7f4ff1bdc4c366fa653d6d808b1f7..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
index df842bf2eee412c0fa22564913a9ccddad7c87cf..1da8e2d05bd8f1fd16f7b3dcff412ed48122c02c 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
@@ -61,7 +61,6 @@
         "sct": 1,\r
         "owned": true,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
-        "x.org.iotivity.dpc": false,\r
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     }\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat
index 22acc320f313d3d6f14dbc8c13c6657ee5bbda95..04bec34cb5fc1426124348a9580ded909d2cb317 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
index 952f9bea967e31ab14c533d230730cea8be33377..2bd928af5d44e58ac054c90c675eb9e27773783f 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
@@ -74,7 +74,6 @@
         "owned": false,
         "deviceuuid": "",
         "devowneruuid": "",
-        "rowneruuid": "",
-        "x.org.iotivity.dpc": true
+        "rowneruuid": ""
     }
 }

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat
index 82b4e405784448301d84ff7e1297ab39ee68ff01..135d7b343bf6d4cf9596ec39bce200b9a1ac4f71 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
index 16529fa5f7bc3061e35202a95b1c04ede3a13850..6786580acf87423fc82a3be76fafd913df2afa1b 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
@@ -74,7 +74,6 @@
         "owned": false,\r
         "deviceuuid": "6A757374-776F-726B-4465-765575696430",\r
         "devowneruuid": "",\r
-        "rowneruuid": "6A757374-776F-726B-4465-765575696430",\r
-        "x.org.iotivity.dpc": true\r
+        "rowneruuid": "6A757374-776F-726B-4465-765575696430"\r
     }\r
 }\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
index 63490209b6bc39c969a663bcdf948ca54ac95a47..725a56e7b27c720f86ff852d5ce922112e93c5e4 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
index af5b55f239bdf881d53eab85d88cc552d96367ea..f39b06c2d0497caab25cd1830af143d1795426c7 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
@@ -74,7 +74,6 @@
         "owned": false,\r
         "deviceuuid": "72616E64-5069-6E44-6576-557569643030",\r
         "devowneruuid": "",\r
-        "rowneruuid": "72616E64-5069-6E44-6576-557569643030",\r
-        "x.org.iotivity.dpc": true\r
+        "rowneruuid": "72616E64-5069-6E44-6576-557569643030"\r
     }\r
 }\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat
index 36568cdb5826ee13dc95453c564a54970ebb41fa..ae130bcc4f4e06a3f292ad681485c04c27970329 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
index 977cf87046766d576099cb1af72bdf3c616a788b..eba0cdd946acfb6a5cc01064488278067ae93cb9 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
@@ -79,7 +79,6 @@
         "sct": 1,\r
         "owned": true,\r
         "deviceuuid": "5375624F-776E-6572-436C-69656E743030",\r
-        "x.org.iotivity.dpc": false,\r
         "devowneruuid": "5375624F-776E-6572-436C-69656E743030",\r
         "rowneruuid": "5375624F-776E-6572-436C-69656E743030"\r
     }\r

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 1a4275360f0bf57bbeb779e2133c9e5d6574882b..b16f9749f6d2681b2f1cddefc37a0e1502ebc556 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -305,13 +305,6 @@ OCStackResult DoxmToCBORPayload(const OicSecDoxm_t *doxm, uint8_t **payload, siz
     OICFree(strUuid);
     strUuid = NULL;
 
-    //x.org.iotivity.dpc -- not Mandatory(vendor-specific), but this type is boolean, so instance always has a value.
-    cborEncoderResult = cbor_encode_text_string(&doxmMap, OIC_JSON_DPC_NAME,
-        strlen(OIC_JSON_DPC_NAME));
-    VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding DPC Tag.");
-    cborEncoderResult = cbor_encode_boolean(&doxmMap, doxm->dpc);
-    VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding DPC Value.");
-
     //RT -- Mandatory
     CborEncoder rtArray;
     cborEncoderResult = cbor_encode_text_string(&doxmMap, OIC_JSON_RT_NAME,
@@ -526,18 +519,6 @@ static OCStackResult CBORPayloadToDoxmBin(const uint8_t *cborPayload, size_t siz
         doxm->owned = gDoxm->owned;
     }
 
-    cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_DPC_NAME, &doxmMap);
-    if (CborNoError == cborFindResult && cbor_value_is_boolean(&doxmMap))
-    {
-        cborFindResult = cbor_value_get_boolean(&doxmMap, &doxm->dpc);
-        VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding DPC Value.")
-    }
-    else // PUT/POST JSON may not have dpc so set it to the gDomx->dpc
-    {
-        VERIFY_NON_NULL(TAG, gDoxm, ERROR);
-        doxm->dpc = gDoxm->dpc;
-    }
-
     cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_DEVICE_ID_NAME, &doxmMap);
     if (CborNoError == cborFindResult && cbor_value_is_text_string(&doxmMap))
     {

diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c
index 5d455492cd2eea8f979e0ad611091445f200d138..9dd8ffe0aa40fff012a24fa138c81e07c816f29d 100644 (file)
--- a/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@ -95,13 +95,13 @@ const char * OIC_JSON_OWNERS_NAME = "ownrs";
 const char * OIC_JSON_OWNER_NAME = "ownr";
 const char * OIC_JSON_DEVOWNERID_NAME = "devowneruuid";
 #ifdef _ENABLE_MULTIPLE_OWNER_
-const char * OIC_JSON_SUBOWNERID_NAME = "x.org.iotivity.subowneruuid";
+const char * OIC_JSON_SUBOWNERID_NAME = "subowneruuid";
 #endif //_ENABLE_MULTIPLE_OWNER_
 const char * OIC_JSON_OWNED_NAME = "owned";
 const char * OIC_JSON_OXM_NAME = "oxm";
 const char * OIC_JSON_OXMS_NAME = "oxms";
 #ifdef _ENABLE_MULTIPLE_OWNER_
-const char * OIC_JSON_MOM_NAME = "x.org.iotivity.mom";
+const char * OIC_JSON_MOM_NAME = "mom";
 #endif //_ENABLE_MULTIPLE_OWNER_
 const char * OIC_JSON_OXM_TYPE_NAME = "oxmtype";
 const char * OIC_JSON_OXM_SEL_NAME = "oxmsel";
@@ -131,7 +131,7 @@ const char * OIC_JSON_PERIODS_NAME = "prds";
 const char * OIC_JSON_CRMS_NAME = "crms";
 const char * OIC_JSON_RECURRENCES_NAME = "recurrence";
 const char * OIC_JSON_SUPPORTED_CRED_TYPE_NAME = "sct";
-const char * OIC_JSON_DPC_NAME = "x.org.iotivity.dpc";
+const char * OIC_JSON_DPC_NAME = "dpc";
 const char * OIC_JSON_EDP_NAME = "edp";
 const char * OIC_JSON_PIN_NAME = "pin";
 const char * OIC_JSON_PDACL_NAME = "pdacl";
@@ -147,7 +147,7 @@ const char * OIC_JSON_RT_NAME = OC_RSRVD_RESOURCE_TYPE;
 const char * OIC_JSON_IF_NAME = OC_RSRVD_INTERFACE;
 const char * OIC_JSON_ROWNERID_NAME = "rowneruuid";
 #ifdef _ENABLE_MULTIPLE_OWNER_
-const char * OIC_JSON_EOWNERID_NAME = "x.org.iotivity.eowneruuid";
+const char * OIC_JSON_EOWNERID_NAME = "eowneruuid";
 #endif //_ENABLE_MULTIPLE_OWNER_
 const char * OIC_JSON_ENCODING_NAME = "encoding";
 const char * OIC_JSON_DATA_NAME = "data";
@@ -174,7 +174,7 @@ const char * OXM_JUST_WORKS = "oic.sec.doxm.jw";
 const char * OXM_RANDOM_DEVICE_PIN = "oic.sec.doxm.rdp";
 const char * OXM_MANUFACTURER_CERTIFICATE = "oic.sec.doxm.mfgcert";
 #ifdef _ENABLE_MULTIPLE_OWNER_
-const char * OXM_PRECONF_PIN = "x.org.iotivity.doxm.pcp";
+const char * OXM_PRECONF_PIN = "oic.sec.doxm.pcp";
 #endif //_ENABLE_MULTIPLE_OWNER_
 
 //Credential data encoding methods

diff --git a/resource/csdk/security/tool/json2cbor.c b/resource/csdk/security/tool/json2cbor.c
index 3bb872d7456c6ed12583e209d68e05c2b77e59cd..03b971869ad600c985e97634281db647808eba62 100644 (file)
--- a/resource/csdk/security/tool/json2cbor.c
+++ b/resource/csdk/security/tool/json2cbor.c
@@ -608,14 +608,6 @@ OicSecDoxm_t* JSONToDoxmBin(const char * jsonStr)
         doxm->owned = jsonObj->valueint;
     }
 
-    //DPC -- Mandatory
-    jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_DPC_NAME);
-    if (jsonObj)
-    {
-        VERIFY_SUCCESS(TAG, (cJSON_True == jsonObj->type || cJSON_False == jsonObj->type), ERROR);
-        doxm->dpc = jsonObj->valueint;
-    }
-
 #ifdef _ENABLE_MULTIPLE_OWNER_
     //mom -- Not Mandatory
     jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_MOM_NAME);

diff --git a/resource/csdk/security/unittest/oic_svr_db.dat b/resource/csdk/security/unittest/oic_svr_db.dat
index d0035f47af26548eb83224dfd855671961755eec..56af560f853f19552b3325a05f5c0c2a07350092 100644 (file)
Binary files a/resource/csdk/security/unittest/oic_svr_db.dat and b/resource/csdk/security/unittest/oic_svr_db.dat differ

diff --git a/resource/csdk/security/unittest/oic_svr_db.json b/resource/csdk/security/unittest/oic_svr_db.json
index 983db6d85439dfd83a21489467f0a485c10d6b2b..00fdea4c440a1538dcd40e27c7ecb474e43df337 100644 (file)
--- a/resource/csdk/security/unittest/oic_svr_db.json
+++ b/resource/csdk/security/unittest/oic_svr_db.json
@@ -88,7 +88,6 @@
         "owned": false,
         "deviceuuid": "756E6B6E-6F77-6564-4465-766963654964",
         "devowneruuid": "",
-        "rowneruuid": "756E6B6E-6F77-6564-4465-766963654964",
-        "x.org.iotivity.dpc": true
+        "rowneruuid": "756E6B6E-6F77-6564-4465-766963654964"
     }
 }
\ No newline at end of file

diff --git a/resource/csdk/security/unittest/oic_svr_db_prov.dat b/resource/csdk/security/unittest/oic_svr_db_prov.dat
index b3b9f6fcfdc395fbb2f4f856845451fcebaa974b..69dcf23d501b746d1fac976c8cf38d87d4bc0716 100644 (file)
Binary files a/resource/csdk/security/unittest/oic_svr_db_prov.dat and b/resource/csdk/security/unittest/oic_svr_db_prov.dat differ

diff --git a/resource/csdk/security/unittest/oic_svr_db_prov.json b/resource/csdk/security/unittest/oic_svr_db_prov.json
index 534cae9a9c72711badd826aaf78392654e288d0c..608737b0d0dcc805f9aa4b8ce1201874714a0cd2 100644 (file)
--- a/resource/csdk/security/unittest/oic_svr_db_prov.json
+++ b/resource/csdk/security/unittest/oic_svr_db_prov.json
@@ -97,8 +97,7 @@
         "owned": true,\r
         "deviceuuid": "646f6f72-4465-7669-6365-555549443030",\r
         "devowneruuid": "61646d69-6e44-6576-6963-655575696430",\r
-        "rowneruuid": "61646d69-6e44-6576-6963-655575696430",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "61646d69-6e44-6576-6963-655575696430"\r
     },\r
     "pconf": {\r
         "edp": false,\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
index c3ca4f7fd376c153e822744ade4d469e8d4fa790..3a8925e6ac731292a66de024b9ad0e2df188b027 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat and b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
index a80b09688851b7c1c2c8b4a72fee77414f7f5254..55c1d0137b7da37b441e4916018f42e37e99951f 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
@@ -70,8 +70,7 @@
         "owned": true,\r
         "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
         "devowneruuid": "61646D69-6E44-6576-6963-655555494430",\r
-        "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31393139-3139-3139-3139-313931393139"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat
index 0632ae79e5d8834f134351e6a6ade47d130e8f31..8574d700ddc9bafe756e75a56daead71d22cfeea 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
index 52efc9ab1dd833862ee694318b224afa9cec08d9..795d436b56946e502a51104d8ab2f09941d0e588 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
@@ -70,8 +70,7 @@
         "owned": true,\r
         "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat
index e070ea4c57816d8e3aed4e5e1f40bbceae134925..da6064e9cbb018637821dbcd97fad0cd3bbcc621 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
index 4fcd6db2688435aa62ff8a4a6356cf5fbfbf116a..ddb7cb953b20f84a42fcc38dde0a7f651d2ad25c 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
@@ -76,7 +76,6 @@
         "owned": false,
         "deviceuuid": "64697265-6374-7061-6972-696e67446576",
         "devowneruuid": "",
-        "rowneruuid": "64697265-6374-7061-6972-696e67446576",
-        "x.org.iotivity.dpc": false
+        "rowneruuid": "64697265-6374-7061-6972-696e67446576"
     }
 }

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat
index c929d11bc0b339f52d56e77b48811b7cb6c0ca89..fd246a8b36fb3741cf19367f31fc528039d8e995 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
index 24e28b51df3bff9818690744c7f2dd5b07f1fff9..7590b46e162b7a467fac007ddcf9609851fe3f29 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
@@ -70,8 +70,7 @@
         "owned": true,\r
         "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
         "devowneruuid": "31393139-3139-3139-3139-313931393139",\r
-        "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31393139-3139-3139-3139-313931393139"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat
index 59ab281bd67b78a47088db437834a2e218622c92..c48d81359fd060c5775c6c656aea88a35f1ea537 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
index 25376237f2612b144fb70f0e96fd60012919a92c..52004cbe270042d9a632624f7ab60e59338b87c6 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -112,8 +112,7 @@
         "owned": true,\r
         "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat
index ff63f1a7008180f3902df281a053ad7462db52d6..135d7b343bf6d4cf9596ec39bce200b9a1ac4f71 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json
index 14a7e918112a6fd7355d5c456c3b2e71a47c37e4..a3b70188fbf5bbb5f0cfa51fc16cceadc1afe24a 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json
@@ -76,7 +76,6 @@
         "owned": false,\r
         "deviceuuid": "6a757374-776f-726b-4465-765575696430",\r
         "devowneruuid": "",\r
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
     }\r
 }
\ No newline at end of file

diff --git a/resource/examples/oic_svr_db_client.dat b/resource/examples/oic_svr_db_client.dat
index 0632ae79e5d8834f134351e6a6ade47d130e8f31..8574d700ddc9bafe756e75a56daead71d22cfeea 100644 (file)
Binary files a/resource/examples/oic_svr_db_client.dat and b/resource/examples/oic_svr_db_client.dat differ

diff --git a/resource/examples/oic_svr_db_client.json b/resource/examples/oic_svr_db_client.json
index 74192f31d3efc64ee8bfc9237045d1a5dade6339..43d07b9cc435d5a79e2ee5889e7add1c921f91c9 100644 (file)
--- a/resource/examples/oic_svr_db_client.json
+++ b/resource/examples/oic_svr_db_client.json
@@ -70,8 +70,7 @@
         "owned": true,\r
         "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/examples/oic_svr_db_client_directpairing.dat b/resource/examples/oic_svr_db_client_directpairing.dat
index 146d24033255e000475a1279116098cc3327e164..c11105b2a075f90b081f66bfe3892c621e5f77c3 100644 (file)
Binary files a/resource/examples/oic_svr_db_client_directpairing.dat and b/resource/examples/oic_svr_db_client_directpairing.dat differ

diff --git a/resource/examples/oic_svr_db_client_directpairing.json b/resource/examples/oic_svr_db_client_directpairing.json
index 7f8e9b907a73ffbe2ddf1da24c53b76f58661a6c..aebe93da8b898fa7779d289f0fca1389cff921fc 100644 (file)
--- a/resource/examples/oic_svr_db_client_directpairing.json
+++ b/resource/examples/oic_svr_db_client_directpairing.json
@@ -76,7 +76,6 @@
         "owned": false,\r
         "deviceuuid": "64706169-7269-6e67-4465-765555494430",\r
         "devowneruuid": "",\r
-        "rowneruuid": "64706169-7269-6e67-4465-765555494430",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "64706169-7269-6e67-4465-765555494430"\r
     }\r
 }\r

diff --git a/resource/examples/oic_svr_db_server.dat b/resource/examples/oic_svr_db_server.dat
index 655832ad5a67a709a183d77b50b837a740a290fb..d35ad1884795525d379dae0cb1ef5e294d310487 100644 (file)
Binary files a/resource/examples/oic_svr_db_server.dat and b/resource/examples/oic_svr_db_server.dat differ

diff --git a/resource/examples/oic_svr_db_server.json b/resource/examples/oic_svr_db_server.json
index 6dba20e7aaf9ceb315290b441baf83a8f11a5726..b425999757173de0ef088ffb3f67707399cd2b67 100644 (file)
--- a/resource/examples/oic_svr_db_server.json
+++ b/resource/examples/oic_svr_db_server.json
@@ -82,8 +82,7 @@
         "owned": true,\r
         "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/resource/provisioning/examples/cloud.dat b/resource/provisioning/examples/cloud.dat
index bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 (file)
Binary files a/resource/provisioning/examples/cloud.dat and b/resource/provisioning/examples/cloud.dat differ

diff --git a/resource/provisioning/examples/cloud.json b/resource/provisioning/examples/cloud.json
index 91b6582ad49883a01fa72cc6d0c11390f0a91df5..7f6e747ab4c2c658387d6c7d330d139c4e738522 100644 (file)
--- a/resource/provisioning/examples/cloud.json
+++ b/resource/provisioning/examples/cloud.json
@@ -61,7 +61,6 @@
         "sct": 1,
         "owned": true,
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
-        "x.org.iotivity.dpc": false,
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
     }

diff --git a/resource/provisioning/examples/oic_svr_db_client.dat b/resource/provisioning/examples/oic_svr_db_client.dat
index bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 (file)
Binary files a/resource/provisioning/examples/oic_svr_db_client.dat and b/resource/provisioning/examples/oic_svr_db_client.dat differ

diff --git a/resource/provisioning/examples/oic_svr_db_client.json b/resource/provisioning/examples/oic_svr_db_client.json
index 56e378b88b8b2f2163e8b63082eca8e59b21e500..15a0afc24d93a3594b82ecc8c1d70a3b138e2dd3 100644 (file)
--- a/resource/provisioning/examples/oic_svr_db_client.json
+++ b/resource/provisioning/examples/oic_svr_db_client.json
@@ -63,7 +63,6 @@
         "sct": 1,\r
         "owned": true,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
-        "x.org.iotivity.dpc": false,\r
         "devowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     }\r

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
index 229c8ad7beb393e72f85e8a220ffcbb020af3e3f..6b2e14947d5c7199b0a8ffcfe945ceb177c7a6f8 100644 (file)
Binary files a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat and b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat differ

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
index a502b50bb59365542b2823d26cf59579942c2632..24857ced34b793f570162fbe98bc040d794d7660 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
@@ -76,7 +76,6 @@
         "owned": true,
         "deviceuuid": "61646d69-6e44-6576-6963-655575696430",
         "devowneruuid": "61646d69-6e44-6576-6963-655575696430",
-        "rowneruuid": "61646d69-6e44-6576-6963-655575696430",
-        "x.org.iotivity.dpc": false
+        "rowneruuid": "61646d69-6e44-6576-6963-655575696430"
     }
 }

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat
index 0632ae79e5d8834f134351e6a6ade47d130e8f31..8574d700ddc9bafe756e75a56daead71d22cfeea 100644 (file)
Binary files a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat and b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat differ

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
index 74192f31d3efc64ee8bfc9237045d1a5dade6339..43d07b9cc435d5a79e2ee5889e7add1c921f91c9 100644 (file)
--- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
+++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
@@ -70,8 +70,7 @@
         "owned": true,\r
         "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     },\r
     "cred": {\r
         "creds": [\r

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat
index b5eae8faf92f96df4932d6436b8ebbd5604cf3fa..1c6c9e12ed65a00387217eaf838a1d94f0e22096 100644 (file)
Binary files a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat and b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat differ

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
index 58fd0733e90fc14b9821cdafc5cdf9da35606a69..776cccd717b1d28b3dac322de09ff81c95793fd2 100644 (file)
--- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
+++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
@@ -94,8 +94,7 @@
         "owned": true,\r
         "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
         "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
-        "x.org.iotivity.dpc": false\r
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
     },\r
     "cred": {\r
         "creds": [\r