From 01c9d09f372b13460075ca6ba5820aa1af637c9b Mon Sep 17 00:00:00 2001
From: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Date: Thu, 11 May 2017 21:33:07 -0700
Subject: [PATCH] Update .json/.dat files for ocserverbasicops and
 occlientbasicops

Apps located in /resource/csdk/stack/samples/linux/secure directory.

Edited .json to conform to OCF 1.0 SVR schema (e.g. /acl2, /pstat.dos, etc.),
and re-encoded to CBOR using json2cbor.

Depends on 19593.

Change-Id: Ie06b5b349c727e85403b6b7f0a63242993682e4a
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19817
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
---
 .../stack/samples/linux/secure/oic_amss_db.dat     | Bin 1112 -> 1261 bytes
 .../stack/samples/linux/secure/oic_amss_db.json    | 113 +++++++------
 .../linux/secure/oic_svr_db_client_devowner.dat    | Bin 1112 -> 1261 bytes
 .../linux/secure/oic_svr_db_client_devowner.json   | 113 +++++++------
 .../secure/oic_svr_db_client_directpairing.dat     | Bin 881 -> 1148 bytes
 .../secure/oic_svr_db_client_directpairing.json    | 132 +++++++++------
 .../linux/secure/oic_svr_db_client_nondevowner.dat | Bin 1112 -> 1261 bytes
 .../secure/oic_svr_db_client_nondevowner.json      | 113 +++++++------
 .../samples/linux/secure/oic_svr_db_server.dat     | Bin 1676 -> 1732 bytes
 .../samples/linux/secure/oic_svr_db_server.json    | 178 +++++++++++----------
 .../linux/secure/oic_svr_db_server_justworks.dat   | Bin 881 -> 1392 bytes
 .../linux/secure/oic_svr_db_server_justworks.json  | 159 ++++++++++++------
 12 files changed, 466 insertions(+), 342 deletions(-)

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 8eb061650483785f663b3fabc1d72161c1491852..3b7dc82d6eb03fb475559156d72f187378f0591e 100644
GIT binary patch
delta 148
zcmcb?@s`tke{y1SP9)QUCFwvqv$({lX-R5ga%yG@V|sCEQdVkm$-<1}{Jgx9%7WCa
z#Jv1G-Q=9q#G;96yCyp@ni*ylq!#6778hsc=P^MwGGWtLT9TogTvS<50@XNq3!~#?
XKW26opshxe|1-)kuG}ocWWxjiVevU0

delta 185
zcmaFMd4of3e{y1SP9ziek~AQlSzNL(B{4a*xM^{AacNRkYH~?wX=X~I*5nArUD7%F
z`I*W3#i_~qK&44VC5@RtzFv_YkT+SMNmU9>Pi9eSaeiqL$h65kOg5rRQZkBC)AHbk
y6cm>vmP}@5R+;R~<fe`=D=9OrF&|`dW}047VsUCtW?pJ4SaC%8s?8gjY?uJab4AVo

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 32d7b62..693febe 100644
--- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
@@ -1,63 +1,72 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/sec/acl",
-                            "rel": "",
-                            "rt": ["oic.r.acl"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
-                }
-            ]
-        },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            }
+        ],
         "rowneruuid" : "31393139-3139-3139-3139-313931393139"
     },
     "pstat": {
         "dos": {"s": 3, "p": false},
         "isop": true,
-        "deviceuuid": "31393139-3139-3139-3139-313931393139",
         "rowneruuid": "31393139-3139-3139-3139-313931393139",
         "cm": 0,
         "tm": 0,
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 184e10f9520c3d3e7ad4e20eb0acd04a3160438f..d7ad646edd6246246ff6198ebf91d529b0a2233b 100644
GIT binary patch
delta 148
zcmcb?@s`tke{y1SP9)QUCFwvqv$({lX-R5ga%yG@V|sCEQdVkm$-<1}{Jgx9%7WCa
z#Jv1G-Q=9q#G;96yCyp@ni*ylq!#6778hsc=P^MwGGWtLT9TogTvS<50@XNq3!~#?
XKW26opshxe|1-)kuG}ocWWxjiVevU0

delta 185
zcmaFMd4of3e{y1SP9ziek~AQlSzNL(B{4a*xM^{AacNRkYH~?wX=X~I*5nArUD7%F
z`I*W3#i_~qK&44VC5@RtzFv_YkT+SMNmU9>Pi9eSaeiqL$h65kOg5rRQZkBC)AHbk
y6cm>vmP}@5R+;R~<fe`=D=9OrF&|`dW}047VsUCtW?pJ4SaC%8s?8gjY?uJab4AVo

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 a5e4772..2c4e06b 100644
--- 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
@@ -1,63 +1,72 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/sec/acl",
-                            "rel": "",
-                            "rt": ["oic.r.acl"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
-                }
-            ]
-        },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            }
+        ],
         "rowneruuid" : "32323232-3232-3232-3232-323232323232"
     },
     "pstat": {
         "dos": {"s": 3, "p": false},
         "isop": true,
-        "deviceuuid": "32323232-3232-3232-3232-323232323232",
         "rowneruuid": "32323232-3232-3232-3232-323232323232",
         "cm": 0,
         "tm": 0,
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 836dde12a521b3c52e627c4b6cea0038a4bcb96e..dae6ea588e9f1c5f2454a90738fd90d9d5fae838 100644
GIT binary patch
delta 244
zcmey!_J_lKe{y1SP9(F$l5`-QSzKb&vLrPzIW;qdF}=7nDJwO(WMM{feqLTlWkG6I
zVqSipZgNg)V$npk1FBGkOxP5bmSpHA7gZLN02LZQ6*6N}2sbgaD784hv?w{XxN#Dr
zjZIcTYEf=xadBpT9vf6Y3pV|5i%|7X-p1%SIe?j+1?VfI$&5@gj4L<GF$FUM0BbE@
A%K!iX

delta 175
zcmeyv@sUk!e{y1SP9ziWk~AQlSzNL(B{4a*xM^{AacNRkYH~?wX=X~I)?^vR15#*W
znMJ9^`K3ib)y<Q6m~2Fsq+}GOrse79XC~_xrzYzc6qh8HOs-~D(MT>z%}Ibr=fb6d
sf+<NwC5>4?^?F5mAns&+Ce_Jjm`u4cA!0xmP3B>iVO+IYlR20X0H~osRR910

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 c280b40..a26d85a 100644
--- 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
@@ -1,57 +1,87 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        }
-                    ],
-                    "permission": 2
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/cred",
-                            "rel": "",
-                            "rt": ["oic.r.cred"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 6
-                }
-            ]
-        },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 3,
+                "subject": {
+                  "conntype": "anon-clear"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 6
+            },
+            {
+                "aceid": 4,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 6
+            }
+        ],
         "rowneruuid" : "64697265-6374-7061-6972-696e67446576"
     },
     "pstat": {
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 7354bfd561074afaf70def6d8ffdfe9b82381fd8..2747f791692c16d837b6c77cac8230a1ad2e3c74 100644
GIT binary patch
delta 148
zcmcb?@s`tke{y1SP9)QUCFwvqv$({lX-R5ga%yG@V|sCEQdVkm$-<1}{Jgx9%7WCa
z#Jv1G-Q=9q#G;96yCyp@ni*ylq!#6778hsc=P^MwGGWtLT9TogTvS<50@XNq3!~#?
XKW26opshxe|1-)kuG}ocWWxjiVevU0

delta 185
zcmaFMd4of3e{y1SP9ziek~AQlSzNL(B{4a*xM^{AacNRkYH~?wX=X~I*5nArUD7%F
z`I*W3#i_~qK&44VC5@RtzFv_YkT+SMNmU9>Pi9eSaeiqL$h65kOg5rRQZkBC)AHbk
y6cm>vmP}@5R+;R~<fe`=D=9OrF&|`dW}047VsUCtW?pJ4SaC%8s?8gjY?uJab4AVo

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 f30b29e..0e37e18 100644
--- 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
@@ -1,63 +1,72 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/sec/acl",
-                            "rel": "",
-                            "rt": ["oic.r.acl"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
-                }
-            ]
-        },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 2
+            }
+        ],
         "rowneruuid" : "31393139-3139-3139-3139-313931393139"
     },
     "pstat": {
         "dos": {"s": 3, "p": false},
         "isop": true,
-        "deviceuuid": "31393139-3139-3139-3139-313931393139",
         "rowneruuid": "31393139-3139-3139-3139-313931393139",
         "cm": 0,
         "tm": 0,
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 ad154f7dbfff33e0f4adbd1bb39b4b69cabf4c9c..7b8e6760716ec5c5b771b5b4bf487d6e9feb9cdc 100644
GIT binary patch
delta 246
zcmeC-J;Lj>KRGcuCz5%=l5`-QSzKb&x+FC*IW;qdF}=7nDJwO(WMM{feqLTlWkG6I
zVqSipZgNg)Vo_#MYH@yPQF3Z=^F+gyHdzI!MY);9#hLkeOi=wy*z}i{WauUrRTh+>
z>X*Z!pBb({WwITc*5uEO20~DyS&*c3m`Y&6tVqHunO1UV<!2`A73l%}Wi&a4S%z`t
J=1OK^W&jpjV7&kU

delta 260
zcmX@Y+rw+PKRGcuCz3g1Ng9yOEG}7?l9-%Y+`2fsxHKs%HMyj;G&3bpE3+uIIKQ+A
zDAO`oopI&F^=#5P`uUm3`o*cq`aq3IMJ0`yK)zm)9*{R#pIJqp38xWFOHwk5Qqywb
z2BhRy<W9cNqAZnMl$w(Ok<Ek478I8xmP}@5QJK7#Nq~uI@njiRqsbCX28@d*p8~R4
vn7laQR!x4uv{D`6kfhAC#(a>oGSl>u5{pxFGV@YX!RAGjuiCtkS(q6B8+~Gx

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 c985873..bef7858 100644
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -1,99 +1,107 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },
-                        {
-                            "href": "/oic/sec/acl",
-                            "rel": "",
-                            "rt": ["oic.r.acl"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 2
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
                 },
-                {
-                    "subjectuuid": "32323232-3232-3232-3232-323232323232",
-                    "resources": [
-                        {
-                            "href": "*",
-                            "rel": "",
-                            "rt": ["*"],
-                            "if": ["*"]
-                        }
-                    ],
-                    "permission": 7
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 3,
+                "subject": {
+                    "uuid": "32323232-3232-3232-3232-323232323232"
                 },
-                {
-                    "subjectuuid": "31393139-3139-3139-3139-313931393139",
-                    "resources": [
-                        {
-                            "href": "/a/led",
-                            "rel": "",
-                            "rt": ["oic.core"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 7
+                "resources": [
+                    {
+                        "href": "*",
+                        "rel": "",
+                        "rt": ["*"],
+                        "if": ["*"]
+                    }
+                ],
+                "permission": 7
+            },
+            {
+                "aceid": 4,
+                "subject": {
+                    "uuid": "31393139-3139-3139-3139-313931393139"
                 },
-                {
-                    "subjectuuid": "37373737-3737-3737-3737-373737373737",
-                    "resources": [
-                        {
-                            "href": "/a/led",
-                            "rel": "",
-                            "rt": ["oic.core"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 6
-                }
-            ]
-        },
+                "resources": [
+                    {
+                        "href": "/a/led",
+                        "rel": "",
+                        "rt": ["oic.core"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 7
+            },
+            {
+                "aceid": 5,
+                "subject": {
+                    "uuid": "37373737-3737-3737-3737-373737373737"
+                },
+                "resources": [
+                    {
+                        "href": "/a/led",
+                        "rel": "",
+                        "rt": ["oic.core"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 6
+            }
+        ],
         "rowneruuid" : "31313131-3131-3131-3131-313131313131"
     },
     "pstat": {
         "dos": {"s": 3, "p": false},
         "isop": true,
-        "deviceuuid": "31313131-3131-3131-3131-313131313131",
         "rowneruuid": "31313131-3131-3131-3131-313131313131",
         "cm": 0,
         "tm": 0,
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 87196f932ccd309427c78bf049f64a36f2c5ef4c..4e2f84f5edd332acc4c2545631229a8cfb6b2258 100644
GIT binary patch
literal 1392
zcmds%O;W-z6vqK8D-Yn#joTKe-#5XXZSqP}(j=3l0?X=*_t0VEDL92UVUJ0vOb5d-
zGOX+(FCXvCe}3<ubb%s7AHB2r$V8%a_%??K0m1E&D&h=~eoql+OwR;l5#!896e39^
zC|*be>UEA&2}#=H1og~rEOnWgc`z9Vc1e<w*d<8<N|6Nmv@S@h0&LUMIvtzj7hWgF
zkpfB>REMTm{;CztTCu-26CiV<6ydB>Lv~z{g-(4WXF~rI$P*W&!^v`OOkNqI0QE4R
z<{LX@P%Vv}+YVL6G@9G3o9nrB9nC$q?x{<6H!s`pN=_U1R|W>mUdg?{=NC0`*QLCh
z_!!EW<P!$6C<vZj_Uq5LaclTFYZz)?eCXl>p>(8&lTU=X`iN9J5=%@J7t0vsoml6s
znCD)sa_=DZv3=n(s6<@y*j}{Z*TM!>wh|kFwva-)4VD%!GYroJ!J2vyUR~eZ-rf6l
avNhQKhyEa>rr?i_I*6_M^X+~rtJODz90tY!

literal 881
zcmbV~&rZTX5XONJZ@z^mlNKUvH@*qp+&|N>rQ2<Gw!#&B5|xuL!BhAq+;MlQ*kBYx
z51meDe%<-z>y}eqJ`Aomxr-9*i=Z5E{Wiyj6~JxNNI`F<0o09gmFJC^8OUcNE&0g3
zWyY=w_Z%<gu}@{bl0KDrT$bEG`FH^G00`ecYukluUhB4*QG`-f5Q+{qKiIm<*5}!x
z2BRdR)Yage92KTR;3J`z>Zr-YA$6Kg$Lvg39oZT!wH}^(Q6@g*f79P5yHAGogl(EQ
zq`$EpZC8cSiwcZ4YI&1Ul9CBYB0{n}B6k^!k|awblBFq0v->QWjQxbcBNIE%y<?~9
zAWS}8ymO)Pm13XPJ0VfmJI2+3S=D1&4H>H8MTehTkMLWcer$cfRWJ7e${t5<`{2cj
iT_NB}a`?aK(gB@4joT~o@#OYZyGUE>-f#cSe*X!r6+Z3&

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 58d12de..88a6936 100644
--- 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
@@ -1,76 +1,135 @@
 {
     "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"],
-                            "rel": ""
-                        },
-                        {
-                            "href": "/oic/d",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"],
-                            "rel": ""
-                        },
+        "aclist2": [
+            {
+                "aceid": 1,
+                "subject": {
+                  "conntype": "anon-clear"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 2,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/res",
+                        "rel": "",
+                        "rt": ["oic.wk.res"],
+                        "if": ["oic.if.ll"]
+                    },{
+                        "href": "/oic/d",
+                        "rel": "",
+                        "rt": ["oic.wk.d"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    },{
+                        "href": "/oic/p",
+                        "rel": "",
+                        "rt": ["oic.wk.p"],
+                        "if": ["oic.if.baseline", "oic.if.r"]
+                    }
+                ],
+                "permission": 2
+            },
+            {
+                "aceid": 3,
+                "subject": {
+                  "conntype": "anon-clear"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 6
+            },
+            {
+                "aceid": 4,
+                "subject": {
+                  "conntype": "auth-crypt"
+                },
+                "resources": [
+                    {
+                        "href": "/oic/sec/doxm",
+                        "rel": "",
+                        "rt": ["oic.r.doxm"],
+                        "if": ["oic.if.baseline"]
+                    }
+                ],
+                "permission": 6
+            },
+            {
+                "aceid": 5,
+                "subject": {
+                  "conntype": "anon-clear"
+                },
+                "resources": [
                         {
-                            "href": "/oic/p",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"],
-                            "rel": ""
+                            "href": "/oic/sec/roles",
+                            "rel": "",
+                            "rt": ["oic.r.cred"],
+                            "if": ["oic.if.baseline"]
                         }
                     ],
-                    "permission": 2
+                "permission": 31
+            },
+            {
+                "aceid": 6,
+                "subject": {
+                  "conntype": "auth-crypt"
                 },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"],
-                            "rel": ""
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"],
-                            "rel": ""
-                        },
+                "resources": [
                         {
-                            "href": "/oic/sec/cred",
+                            "href": "/oic/sec/roles",
+                            "rel": "",
                             "rt": ["oic.r.cred"],
-                            "if": ["oic.if.baseline"],
-                            "rel": ""
+                            "if": ["oic.if.baseline"]
                         }
                     ],
-                    "permission": 6
-                }
-            ]
-        },
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"
+                "permission": 31
+            }
+        ],
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
     },
     "pstat": {
         "dos": {"s": 1, "p": false},
         "isop": false,
-        "deviceuuid": "6a757374-776f-726b-4465-765575696430",
         "cm": 2,
         "tm": 0,
         "om": 4,
         "sm": 4,
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
     },
     "doxm": {
         "oxms": [0],
         "oxmsel": 0,
         "sct": 1,
         "owned": false,
-        "deviceuuid": "6a757374-776f-726b-4465-765575696430",
-        "devowneruuid": "",
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"
+        "deviceuuid": "12345678-1234-1234-1234-123456789012",
+        "devowneruuid": "00000000-0000-0000-0000-000000000000",
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
     }
 }
-- 
2.7.4