Skip to content

GitLab

I
iotivity-classic
Commit 7704a4d2 authored by Jongmin Choi's avatar Jongmin Choi Committed by Randeep
Browse files
Options

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: default avatarJongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14641Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarChul Lee <chuls.lee@samsung.com>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Reviewed-by: default avatarPhil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 8141de88
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 77 deletions
android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat 100755 → 100644
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json 100755 → 100644
View file @ 7704a4d2
......@@ -75,7 +75,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"
}
......
android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -63,7 +63,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"
}
......
android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -64,8 +64,7 @@
"owned": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"x.org.iotivity.dpc": false
"rowneruuid": "32323232-3232-3232-3232-323232323232"
},
"cred": {
"creds": [
......
android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
View file @ 7704a4d2
......@@ -94,8 +94,7 @@
"owned": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"x.org.iotivity.dpc": false
"rowneruuid": "31313131-3131-3131-3131-313131313131"
},
"cred": {
"creds": [
......
resource/csdk/security/provisioning/sample/cloud.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/csdk/security/provisioning/sample/cloud.json
View file @ 7704a4d2
......@@ -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"
}
......
resource/csdk/security/provisioning/sample/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -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"
}
......
resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
View file @ 7704a4d2
......@@ -74,7 +74,6 @@
"owned": false,
"deviceuuid": "",
"devowneruuid": "",
"rowneruuid": "",
"x.org.iotivity.dpc": true
"rowneruuid": ""
}
}
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
View file @ 7704a4d2
......@@ -74,7 +74,6 @@
"owned": false,
"deviceuuid": "6A757374-776F-726B-4465-765575696430",
"devowneruuid": "",
"rowneruuid": "6A757374-776F-726B-4465-765575696430",
"x.org.iotivity.dpc": true
"rowneruuid": "6A757374-776F-726B-4465-765575696430"
}
}
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
View file @ 7704a4d2
......@@ -74,7 +74,6 @@
"owned": false,
"deviceuuid": "72616E64-5069-6E44-6576-557569643030",
"devowneruuid": "",
"rowneruuid": "72616E64-5069-6E44-6576-557569643030",
"x.org.iotivity.dpc": true
"rowneruuid": "72616E64-5069-6E44-6576-557569643030"
}
}
resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
View file @ 7704a4d2
......@@ -79,7 +79,6 @@
"sct": 1,
"owned": true,
"deviceuuid": "5375624F-776E-6572-436C-69656E743030",
"x.org.iotivity.dpc": false,
"devowneruuid": "5375624F-776E-6572-436C-69656E743030",
"rowneruuid": "5375624F-776E-6572-436C-69656E743030"
}
......
resource/csdk/security/src/doxmresource.c
View file @ 7704a4d2
......@@ -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))
{
......
resource/csdk/security/src/srmresourcestrings.c
View file @ 7704a4d2
......@@ -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
......
resource/csdk/security/tool/json2cbor.c
View file @ 7704a4d2
......@@ -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);
......
resource/csdk/security/unittest/oic_svr_db.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/csdk/security/unittest/oic_svr_db.json
View file @ 7704a4d2
......@@ -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
resource/csdk/security/unittest/oic_svr_db_prov.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/csdk/security/unittest/oic_svr_db_prov.json
View file @ 7704a4d2
......@@ -97,8 +97,7 @@
"owned": true,
"deviceuuid": "646f6f72-4465-7669-6365-555549443030",
"devowneruuid": "61646d69-6e44-6576-6963-655575696430",
"rowneruuid": "61646d69-6e44-6576-6963-655575696430",
"x.org.iotivity.dpc": false
"rowneruuid": "61646d69-6e44-6576-6963-655575696430"
},
"pconf": {
"edp": false,
......
resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/csdk/stack/samples/linux/secure/oic_amss_db.json
View file @ 7704a4d2
......@@ -70,8 +70,7 @@
"owned": true,
"deviceuuid": "31393139-3139-3139-3139-313931393139",
"devowneruuid": "61646D69-6E44-6576-6963-655555494430",
"rowneruuid": "31393139-3139-3139-3139-313931393139",
"x.org.iotivity.dpc": false
"rowneruuid": "31393139-3139-3139-3139-313931393139"
},
"cred": {
"creds": [
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
View file @ 7704a4d2
......@@ -70,8 +70,7 @@
"owned": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"x.org.iotivity.dpc": false
"rowneruuid": "32323232-3232-3232-3232-323232323232"
},
"cred": {
"creds": [
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
View file @ 7704a4d2
......@@ -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"
}
}
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
View file @ 7704a4d2
......@@ -70,8 +70,7 @@
"owned": true,
"deviceuuid": "31393139-3139-3139-3139-313931393139",
"devowneruuid": "31393139-3139-3139-3139-313931393139",
"rowneruuid": "31393139-3139-3139-3139-313931393139",
"x.org.iotivity.dpc": false
"rowneruuid": "31393139-3139-3139-3139-313931393139"
},
"cred": {
"creds": [
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
View file @ 7704a4d2
......@@ -112,8 +112,7 @@
"owned": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"x.org.iotivity.dpc": false
"rowneruuid": "31313131-3131-3131-3131-313131313131"
},
"cred": {
"creds": [
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json
View file @ 7704a4d2
......@@ -76,7 +76,6 @@
"owned": false,
"deviceuuid": "6a757374-776f-726b-4465-765575696430",
"devowneruuid": "",
"rowneruuid": "6a757374-776f-726b-4465-765575696430",
"x.org.iotivity.dpc": false
"rowneruuid": "6a757374-776f-726b-4465-765575696430"
}
}
\ No newline at end of file
resource/examples/oic_svr_db_client.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/examples/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -70,8 +70,7 @@
"owned": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"x.org.iotivity.dpc": false
"rowneruuid": "32323232-3232-3232-3232-323232323232"
},
"cred": {
"creds": [
......
resource/examples/oic_svr_db_client_directpairing.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/examples/oic_svr_db_client_directpairing.json
View file @ 7704a4d2
......@@ -76,7 +76,6 @@
"owned": false,
"deviceuuid": "64706169-7269-6e67-4465-765555494430",
"devowneruuid": "",
"rowneruuid": "64706169-7269-6e67-4465-765555494430",
"x.org.iotivity.dpc": false
"rowneruuid": "64706169-7269-6e67-4465-765555494430"
}
}
resource/examples/oic_svr_db_server.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/examples/oic_svr_db_server.json
View file @ 7704a4d2
......@@ -82,8 +82,7 @@
"owned": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"x.org.iotivity.dpc": false
"rowneruuid": "31313131-3131-3131-3131-313131313131"
},
"cred": {
"creds": [
......
resource/provisioning/examples/cloud.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/provisioning/examples/cloud.json
View file @ 7704a4d2
......@@ -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"
}
......
resource/provisioning/examples/oic_svr_db_client.dat
View file @ 7704a4d2
This diff was suppressed by a .gitattributes entry.
resource/provisioning/examples/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -63,7 +63,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"
}
......
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -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"
}
}
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
View file @ 7704a4d2
......@@ -70,8 +70,7 @@
"owned": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"x.org.iotivity.dpc": false
"rowneruuid": "32323232-3232-3232-3232-323232323232"
},
"cred": {
"creds": [
......
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
View file @ 7704a4d2
......@@ -94,8 +94,7 @@
"owned": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"x.org.iotivity.dpc": false
"rowneruuid": "31313131-3131-3131-3131-313131313131"
},
"cred": {
"creds": [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment