Remove x.org.iotivity from secure resources 63/14663/2
authorJongmin Choi <jminl.choi@samsung.com>
Wed, 23 Nov 2016 07:41:01 +0000 (16:41 +0900)
committerRandeep Singh <randeep.s@samsung.com>
Thu, 24 Nov 2016 04:10:19 +0000 (04:10 +0000)
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>
(cherry picked from commit 7704a4d2318cf63bccb3fc09c9e8ca9cb8eaf0c7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14663

55 files changed:
android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat [changed mode: 0755->0644]
android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json [changed mode: 0755->0644]
android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat
android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat
android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat
android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
resource/csdk/security/provisioning/sample/cloud.dat
resource/csdk/security/provisioning/sample/cloud.json
resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
resource/csdk/security/provisioning/sample/oic_svr_db_client.json
resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat
resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat
resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/security/unittest/oic_svr_db.dat
resource/csdk/security/unittest/oic_svr_db.json
resource/csdk/security/unittest/oic_svr_db_prov.dat
resource/csdk/security/unittest/oic_svr_db_prov.json
resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
resource/csdk/stack/samples/linux/secure/oic_amss_db.json
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_client.json
resource/examples/oic_svr_db_client_directpairing.dat
resource/examples/oic_svr_db_client_directpairing.json
resource/examples/oic_svr_db_server.dat
resource/examples/oic_svr_db_server.json
resource/provisioning/examples/cloud.dat
resource/provisioning/examples/cloud.json
resource/provisioning/examples/oic_svr_db_client.dat
resource/provisioning/examples/oic_svr_db_client.json
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json

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
old mode 100755 (executable)
new mode 100644 (file)
index 09cc117..03bca8c
@@ -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
index 6b67286..f3cf369 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
index 859aeb6..29fd2bd 100644 (file)
@@ -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
index c6c73ed..3a61974 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
index a320bcc..0cce3d9 100644 (file)
@@ -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
index b5eae8f..1c6c9e1 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
index 58fd073..776cccd 100644 (file)
@@ -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
index bb6e553..a7549d1 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/cloud.dat and b/resource/csdk/security/provisioning/sample/cloud.dat differ
index 91b6582..7f6e747 100644 (file)
@@ -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"
     }
index c8a6af4..a7549d1 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
index df842bf..1da8e2d 100644 (file)
@@ -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
index 22acc32..04bec34 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
index 952f9be..2bd928a 100644 (file)
@@ -74,7 +74,6 @@
         "owned": false,
         "deviceuuid": "",
         "devowneruuid": "",
-        "rowneruuid": "",
-        "x.org.iotivity.dpc": true
+        "rowneruuid": ""
     }
 }
index 82b4e40..135d7b3 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
index 16529fa..6786580 100644 (file)
@@ -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
index 6349020..725a56e 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
index af5b55f..f39b06c 100644 (file)
@@ -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
index 36568cd..ae130bc 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
index 977cf87..eba0cdd 100644 (file)
@@ -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
index 1a42753..b16f974 100644 (file)
@@ -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))
     {
index 5d45549..9dd8ffe 100644 (file)
@@ -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
index 09024f8..9528634 100644 (file)
@@ -609,14 +609,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);
index d0035f4..56af560 100644 (file)
Binary files a/resource/csdk/security/unittest/oic_svr_db.dat and b/resource/csdk/security/unittest/oic_svr_db.dat differ
index 983db6d..00fdea4 100644 (file)
@@ -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
index b3b9f6f..69dcf23 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
index 534cae9..608737b 100644 (file)
@@ -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
index c3ca4f7..3a8925e 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
index a80b096..55c1d01 100644 (file)
@@ -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
index 0632ae7..8574d70 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
index 52efc9a..795d436 100644 (file)
@@ -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
index e070ea4..da6064e 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
index 4fcd6db..ddb7cb9 100644 (file)
@@ -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"
     }
 }
index c929d11..fd246a8 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
index 24e28b5..7590b46 100644 (file)
@@ -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
index 59ab281..c48d813 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
index 2537623..52004cb 100644 (file)
         "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
index ff63f1a..135d7b3 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
index 14a7e91..a3b7018 100644 (file)
@@ -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
index 0632ae7..8574d70 100644 (file)
Binary files a/resource/examples/oic_svr_db_client.dat and b/resource/examples/oic_svr_db_client.dat differ
index 74192f3..43d07b9 100644 (file)
@@ -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
index 146d240..c11105b 100644 (file)
Binary files a/resource/examples/oic_svr_db_client_directpairing.dat and b/resource/examples/oic_svr_db_client_directpairing.dat differ
index 7f8e9b9..aebe93d 100644 (file)
@@ -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
index 655832a..d35ad18 100644 (file)
Binary files a/resource/examples/oic_svr_db_server.dat and b/resource/examples/oic_svr_db_server.dat differ
index 6dba20e..b425999 100644 (file)
@@ -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
index bb6e553..a7549d1 100644 (file)
Binary files a/resource/provisioning/examples/cloud.dat and b/resource/provisioning/examples/cloud.dat differ
index 91b6582..7f6e747 100644 (file)
@@ -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"
     }
index bb6e553..a7549d1 100644 (file)
Binary files a/resource/provisioning/examples/oic_svr_db_client.dat and b/resource/provisioning/examples/oic_svr_db_client.dat differ
index 56e378b..15a0afc 100644 (file)
@@ -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
index 229c8ad..6b2e149 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
index a502b50..24857ce 100644 (file)
@@ -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"
     }
 }
index 0632ae7..8574d70 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
index 74192f3..43d07b9 100644 (file)
@@ -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
index b5eae8f..1c6c9e1 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
index 58fd073..776cccd 100644 (file)
@@ -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