Remove ACE related to /oic/sec/acl on defualt ACE setting

Remove ACE related to /oic/sec/acl on defualt ACE setting
on SVR file of unowned sample apps, because that is not
required to Ownership Transfer.

Patch 1: upload patch.

Change-Id: Iff9b203cca64b7829ee3018587a1bc758ab966ac
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15599
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16945
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat
index 2fa0b63..2391448 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
index fd3fb33..dd811fb 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
@@ -40,12 +40,6 @@
                             "if": ["oic.if.baseline"]\r
                         },\r
                         {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
                             "href": "/oic/sec/cred",\r
                             "rel": "",\r
                             "rt": ["oic.r.cred"],\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat
index a3dce21..472ef8e 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
index 43eeff1..89b960c 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
@@ -40,12 +40,6 @@
                             "if": ["oic.if.baseline"]\r
                         },\r
                         {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
                             "href": "/oic/sec/cred",\r
                             "rel": "",\r
                             "rt": ["oic.r.cred"],\r

diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c
index 777d706..c607291 100644 (file)
--- a/resource/csdk/security/src/aclresource.c
+++ b/resource/csdk/security/src/aclresource.c
@@ -47,7 +47,7 @@
 #include "security_internals.h"
 
 #define TAG  "OIC_SRM_ACL"
-#define NUMBER_OF_SEC_PROV_RSCS 4
+#define NUMBER_OF_SEC_PROV_RSCS 3
 #define NUMBER_OF_DEFAULT_SEC_RSCS 2
 #define STRING_UUID_SIZE (UUID_LENGTH * 2 + 5)
 
@@ -2749,8 +2749,6 @@ OCStackResult UpdateDefaultSecProvACE()
                                strlen(OIC_RSRC_DOXM_URI) + 1) == 0 ||
                        strncmp(rsrc->href, OIC_RSRC_CRED_URI,
                                strlen(OIC_RSRC_CRED_URI) + 1) == 0 ||
-                       strncmp(rsrc->href, OIC_RSRC_ACL_URI,
-                               strlen(OIC_RSRC_ACL_URI) + 1) == 0 ||
                        strncmp(rsrc->href, OIC_RSRC_PSTAT_URI,
                                strlen(OIC_RSRC_PSTAT_URI) + 1) == 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 da6064e..56f60b9 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

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 ddb7cb9..1fcceb7 100644 (file)
--- 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
@@ -42,12 +42,6 @@
                             "if": ["oic.if.baseline"]
                         },
                         {
-                            "href": "/oic/sec/acl",
-                            "rel": "",
-                            "rt": ["oic.r.acl"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
                             "href": "/oic/sec/cred",
                             "rel": "",
                             "rt": ["oic.r.cred"],
@@ -66,8 +60,8 @@
         "rowneruuid": "64697265-6374-7061-6972-696e67446576",
         "cm": 2,
         "tm": 0,
-        "om": 3,
-        "sm": 3
+        "om": 4,
+        "sm": 4
         },
     "doxm": {
         "oxms": [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 135d7b3..e02d465 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

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 a3b7018..b8941d4 100644 (file)
--- 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
@@ -42,12 +42,6 @@
                             "rel": ""\r
                         },\r
                         {\r
-                            "href": "/oic/sec/acl",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"],\r
-                            "rel": ""\r
-                        },\r
-                        {\r
                             "href": "/oic/sec/cred",\r
                             "rt": ["oic.r.cred"],\r
                             "if": ["oic.if.baseline"],\r
@@ -78,4 +72,4 @@
         "devowneruuid": "",\r
         "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/resource/examples/oic_svr_db_client_directpairing.dat b/resource/examples/oic_svr_db_client_directpairing.dat
index c11105b..9aa6bcc 100644 (file)
Binary files a/resource/examples/oic_svr_db_client_directpairing.dat and b/resource/examples/oic_svr_db_client_directpairing.dat differ

diff --git a/resource/examples/oic_svr_db_client_directpairing.json b/resource/examples/oic_svr_db_client_directpairing.json
index aebe93d..577582f 100644 (file)
--- a/resource/examples/oic_svr_db_client_directpairing.json
+++ b/resource/examples/oic_svr_db_client_directpairing.json
@@ -42,12 +42,6 @@
                             "if": ["oic.if.baseline"]\r
                         },\r
                         {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
                             "href": "/oic/sec/cred",\r
                             "rel": "",\r
                             "rt": ["oic.r.cred"],\r
@@ -66,8 +60,8 @@
         "rowneruuid": "64706169-7269-6e67-4465-765555494430",\r
         "cm": 2,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3\r
+        "om": 4,\r
+        "sm": 4\r
         },\r
     "doxm": {\r
         "oxms": [0],\r

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
index 6b2e149..a7549d1 100644 (file)
Binary files a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat and b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat differ

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
index 24857ce..5bc15fc 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
@@ -22,18 +22,6 @@
                             "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"]
-                        },
-                        {
-                            "href": "/oic/res/types/d",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.baseline"]
                         }
                     ],
                     "permission": 2