[IOT-1943] updated .json and .dat in /csdk/stack/samples/linux/secure 67/20267/2
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Mon, 22 May 2017 17:54:48 +0000 (10:54 -0700)
committerRandeep Singh <randeep.s@samsung.com>
Wed, 24 May 2017 08:45:21 +0000 (08:45 +0000)
These are being referenced as examples in addition to the files
in /csdk/security/provisioning/samples and so must be updated.

Please include these updates in 1.3.0 to avoid creating additional
bad .json and .dat files based off these.

Change-Id: I9f54988c1fb2914a2b63b7d4887edef99e27f440
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20267
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 files changed:
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

index 3b7dc82..b372bc2 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 693febe..6d00767 100644 (file)
@@ -3,61 +3,23 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             }\r
index d7ad646..dbe0f6f 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 2c4e06b..221f37a 100644 (file)
@@ -3,61 +3,23 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             }\r
index dae6ea5..7f2809a 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 a26d85a..224107a 100644 (file)
@@ -3,83 +3,40 @@
         "aclist2": [
             {
                 "aceid": 1,
-                "subject": {
-                  "conntype": "anon-clear"
-                },
+                "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"]
-                    }
+                    { "href": "/oic/res" },
+                    { "href": "/oic/d" },
+                    { "href": "/oic/p"}
                 ],
                 "permission": 2
             },
             {
                 "aceid": 2,
-                "subject": {
-                  "conntype": "auth-crypt"
-                },
+                "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/res" },
+                    { "href": "/oic/d" },
+                    { "href": "/oic/p"}
                 ],
                 "permission": 2
             },
             {
                 "aceid": 3,
-                "subject": {
-                  "conntype": "anon-clear"
-                },
+                "subject": { "conntype": "anon-clear" },
                 "resources": [
-                    {
-                        "href": "/oic/sec/doxm",
-                        "rel": "",
-                        "rt": ["oic.r.doxm"],
-                        "if": ["oic.if.baseline"]
-                    }
+                    { "href": "/oic/sec/doxm" }
                 ],
-                "permission": 6
+                "permission": 14
             },
             {
                 "aceid": 4,
-                "subject": {
-                  "conntype": "auth-crypt"
-                },
+                "subject": { "conntype": "auth-crypt" },
                 "resources": [
-                    {
-                        "href": "/oic/sec/doxm",
-                        "rel": "",
-                        "rt": ["oic.r.doxm"],
-                        "if": ["oic.if.baseline"]
-                    }
+                    { "href": "/oic/sec/doxm" },
+                    { "href": "/oic/sec/roles" }
                 ],
-                "permission": 6
+                "permission": 14
             }
         ],
         "rowneruuid" : "64697265-6374-7061-6972-696e67446576"
index 2747f79..315108a 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 0e37e18..11c5bb7 100644 (file)
@@ -3,61 +3,23 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             }\r
index 7b8e676..156653f 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 bef7858..f61906e 100644 (file)
@@ -3,97 +3,42 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p" },\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                    "uuid": "32323232-3232-3232-3232-323232323232"\r
-                },\r
-                "resources": [\r
-                    {\r
-                        "href": "*",\r
-                        "rel": "",\r
-                        "rt": ["*"],\r
-                        "if": ["*"]\r
-                    }\r
-                ],\r
+                "subject": { "uuid": "32323232-3232-3232-3232-323232323232" },\r
+                "resources": [{ "wc": "*" }],\r
                 "permission": 7\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                    "uuid": "31393139-3139-3139-3139-313931393139"\r
-                },\r
-                "resources": [\r
-                    {\r
-                        "href": "/a/led",\r
-                        "rel": "",\r
-                        "rt": ["oic.core"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
-                ],\r
+                "subject": { "uuid": "31393139-3139-3139-3139-313931393139" },\r
+                "resources": [{ "href": "/a/led" }],\r
                 "permission": 7\r
             },\r
             {\r
                 "aceid": 5,\r
-                "subject": {\r
-                    "uuid": "37373737-3737-3737-3737-373737373737"\r
-                },\r
-                "resources": [\r
-                    {\r
-                        "href": "/a/led",\r
-                        "rel": "",\r
-                        "rt": ["oic.core"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
-                ],\r
+                "subject": { "uuid": "37373737-3737-3737-3737-373737373737" },\r
+                "resources": [{ "href": "/a/led" }],\r
                 "permission": 6\r
             }\r
         ],\r
index 4e2f84f..4296544 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 88a6936..ddd50db 100644 (file)
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid": "00000000-0000-0000-0000-000000000000"\r
     },\r
     "pstat": {\r
-        "dos": {"s": 1, "p": false},\r
+        "dos": { "s": 1, "p": false },\r
         "isop": false,\r
         "cm": 2,\r
         "tm": 0,\r