Commit f829a81a authored by Yonggoo Kang's avatar Yonggoo Kang Committed by Randeep

Update db files and Fix json2cbor tool

patch#1 : 1. Update dat/json files.
          2. Fix json2cbor tool about CRED
patch#2 : Rebase to resolve conflict, minor fix
patch#3 : Resolve SVACE issue, check return value

Change-Id: Ibcaa8f2d0588924e42ab8985dac7b15a82579c8c
Signed-off-by: default avatarYonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6301Reviewed-by: default avatarDmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: default avatardongik Lee <dongik.lee@samsung.com>
Reviewed-by: default avatarJongsung Lee <js126.lee@samsung.com>
Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 8b85e3b4
{
"acl": [
{
"sub": "Kg==",
"rsrc": [
"/oic/res",
"/oic/d",
"/oic/p",
"/oic/res/types/d",
"/oic/ad",
"/oic/sec/amacl"
],
"perms": 2,
"ownrs" : ["YWRtaW5EZXZpY2VVVUlEMA=="]
},
{
"sub": "Kg==",
"rsrc": [
"/oic/sec/doxm",
"/oic/sec/pstat"
],
"perms": 2,
"ownrs" : ["YWRtaW5EZXZpY2VVVUlEMA=="]
}
],
"pstat": {
"isop": true,
"deviceid": "YWRtaW5EZXZpY2VVVUlEMA==",
"ch": 0,
"cm": 0,
"tm": 0,
"om": 3,
"sm": [3]
},
"doxm": {
"oxm": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceid": "YWRtaW5EZXZpY2VVVUlEMA==",
"ownr": "YWRtaW5EZXZpY2VVVUlEMA=="
}
}
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": "",
"if": ""
} ,
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
}
]
},
"rowneruuid" : "61646d69-6e44-6576-6963-655555494430"
},
"pstat": {
"isop": true,
"deviceuuid": "61646d69-6e44-6576-6963-655555494430",
"rowneruuid": "61646d69-6e44-6576-6963-655555494430",
"cm": 0,
"tm": 0,
"om": 3,
"sm": 3
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceuuid": "61646d69-6e44-6576-6963-655555494430",
"devowneruuid": "61646d69-6e44-6576-6963-655555494430",
"rowneruuid": "61646d69-6e44-6576-6963-655555494430",
"dpc": false
}
}
\ No newline at end of file
{
"acl": [
{
"sub": "Kg==",
"rsrc": [
"/oic/res",
"/oic/d",
"/oic/p",
"/oic/res/types/d",
"/oic/ad",
"/oic/sec/acl"
],
"perms": 2,
"ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
},
{
"sub": "Kg==",
"rsrc": [
"/oic/sec/doxm",
"/oic/sec/pstat"
],
"perms": 2,
"ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
}
],
"pstat": {
"isop": true,
"deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
"ch": 0,
"cm": 0,
"tm": 0,
"om": 3,
"sm": [3]
},
"doxm": {
"oxm": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceid": "MjIyMjIyMjIyMjIyMjIyMg==",
"ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
},
"cred": [{
"credid": 1,
"sub": "MTExMTExMTExMTExMTExMQ==",
"credtyp": 1,
"pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
"ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
}]
}
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": "",
"if": ""
} ,
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
}
]
},
"rowneruuid" : "32323232-3232-3232-3232-323232323232"
},
"pstat": {
"isop": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"cm": 0,
"tm": 0,
"om": 3,
"sm": 3
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"dpc": false
},
"cred": {
"creds": [
{
"credid": 1,
"subjectuuid": "31313131-3131-3131-3131-313131313131",
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
}
}
],
"rowneruuid": "32323232-3232-3232-3232-323232323232"
}
}
\ No newline at end of file
{
"acl": [
{
"sub": "Kg==",
"rsrc": [
"/oic/res",
"/oic/d",
"/oic/p",
"/oic/res/types/d",
"/oic/ad",
"/oic/sec/acl"
],
"perms": 2,
"ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
},
{
"sub": "Kg==",
"rsrc": [
"/oic/sec/doxm",
"/oic/sec/pstat"
],
"perms": 2,
"ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
},
{
"sub": "Kg==",
"rsrc": ["/light0", "/light1", "/a/light"],
"perms": 6,
"ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
}
],
"pstat": {
"isop": true,
"deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
"ch": 0,
"cm": 0,
"tm": 0,
"om": 3,
"sm": [3]
},
"doxm": {
"oxm": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceid": "MTExMTExMTExMTExMTExMQ==",
"ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
},
"cred": [{
"credid": 1,
"sub": "MjIyMjIyMjIyMjIyMjIyMg==",
"credtyp": 1,
"pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
"ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
}]
}
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": "",
"if": ""
} ,
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/a/light",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/a/light0",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/a/light1",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 6
}
]
},
"rowneruuid" : "31313131-3131-3131-3131-313131313131"
},
"pstat": {
"isop": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"cm": 0,
"tm": 0,
"om": 3,
"sm": 3
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceuuid": "31313131-3131-3131-3131-313131313131",
"devowneruuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "31313131-3131-3131-3131-313131313131",
"dpc": false
},
"cred": {
"creds": [
{
"credid": 1,
"subjectuuid": "32323232-3232-3232-3232-323232323232",
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
}
}
],
"rowneruuid": "31313131-3131-3131-3131-313131313131"
}
}
This diff was suppressed by a .gitattributes entry.
{
"acl": {
"aclist":{
"aces":[
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rt": "",
"if": ""
},
{
"href": "/oic/presence",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/pstat",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/crl",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/cred",
"rt": "",
"if": ""
}
],
"permission": 6
}
]
},
"rowneruuid" : "646F6F72-4465-7669-6365-555549443030"
},
"pstat": {
"isop": false,
"deviceuuid": "646F6F72-4465-7669-6365-555549443030",
"rowneruuid": "646F6F72-4465-7669-6365-555549443030",
"cm": 2,
"tm": 0,
"om": 3,
"sm": 3
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": false,
"didformat": 0,
"dpc": false,
"deviceuuid": "646F6F72-4465-7669-6365-555549443030",
"rowneruuid": "646F6F72-4465-7669-6365-555549443030"
}
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/presence",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2