[IOT-1943] updated .json and .dat in /csdk/stack/samples/linux/secure
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 3b7dc82d6eb03fb475559156d72f187378f0591e..b372bc283dc0b8ffc7448a74cd9fec9de067478a 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 693febe9494b9ede3f2d5744090675e031f19226..6d00767147a8bccc3d4933572cdcbf4eda9a4f15 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 d7ad646edd6246246ff6198ebf91d529b0a2233b..dbe0f6f59c3eade4f2a4c208f3bee38fa16b3d64 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 2c4e06bea2a1c3f9f5e5faa290ad8e1f16224b42..221f37a6df1392a9a8a9431a1d21c7fc3725ec19 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 dae6ea588e9f1c5f2454a90738fd90d9d5fae838..7f2809afad9b1c39bba754b01092790ef188ceb6 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 a26d85a8a4c8fb767cd25685a069b71cebdf1472..224107a544d5f491898257d52d6b135e741ff583 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 2747f791692c16d837b6c77cac8230a1ad2e3c74..315108aabfdf5640ce895d639f879f985eb184f4 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 0e37e18665a5ae7cdaf67a6ae0f9371bea5baf00..11c5bb7a72f630f2ce4127ca834d4ac68920686f 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 7b8e6760716ec5c5b771b5b4bf487d6e9feb9cdc..156653f95ff5233eeda807db656f2b985dc3aeaa 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 bef7858e9efc1a7b8607e96f7e8ed5c897525b8b..f61906e76d2fc8b2f818a486717df12054f205ca 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 4e2f84f5edd332acc4c2545631229a8cfb6b2258..42965444fc157d028ffcd0a798f66ca0d4b289ab 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 88a6936a5163f68ac0af2f1073abb838c88ce943..ddd50dbcc0aeed4fe251679a5e1db991148c33d9 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