[IOT-1396] Changed values of OicSecDpom_t to align with oic.sec.pomtype from Security...

The bitmask values for the pstat.om and pstat.sm properties were incorrectly
defined.  A few other files (including provisioning tool files) appeared to use
the values incorrectly, and are also fixed as part of this patch.

Patch #2: .json and .dat files changed accordingly
Patch #3: unittest svd db changed accordingly

Change-Id: Ie1d4b13a271eafea38b41313bba6e087b69a2f62
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat
index 1c157a9..6b67286 100644 (file)
Binary files a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat and b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.dat differ

diff --git a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
index d5e0cff..859aeb6 100644 (file)
--- a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
+++ b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
@@ -52,8 +52,8 @@
         "isop": true,\r
         "cm": 2,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3,\r
+        "om": 4,\r
+        "sm": 4,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     },\r

diff --git a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat
index 8e96f40..c6c73ed 100644 (file)
Binary files a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat and b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat differ

diff --git a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
index dbe34ea..a320bcc 100644 (file)
--- a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
+++ b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
@@ -54,8 +54,8 @@
         "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
         "cm": 0,\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/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat
index 0c337c5..b5eae8f 100644 (file)
Binary files a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat and b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.dat differ

diff --git a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
index 2d5935e..58fd073 100644 (file)
--- a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
+++ b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json
@@ -84,8 +84,8 @@
         "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
         "cm": 0,\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/resource/csdk/security/include/securevirtualresourcetypes.h b/resource/csdk/security/include/securevirtualresourcetypes.h
index de17cad..8e035d9 100644 (file)
--- a/resource/csdk/security/include/securevirtualresourcetypes.h
+++ b/resource/csdk/security/include/securevirtualresourcetypes.h
@@ -222,12 +222,14 @@ typedef enum OicSecDpm
     // << 6 THROUGH 15 RESERVED
 } OicSecDpm_t;
 
+// These types are taken from the Security Spec v1.1.12 /pstat resource definition
+// Note that per the latest spec, there is NO definition for Multiple Service Client Directed
+// provisioning mode, so that enum value has been removed.
 typedef enum OicSecDpom
 {
-    MULTIPLE_SERVICE_SERVER_DRIVEN  = 0x0,
-    SINGLE_SERVICE_SERVER_DRIVEN    = 0x1,
-    MULTIPLE_SERVICE_CLIENT_DRIVEN  = 0x2,
-    SINGLE_SERVICE_CLIENT_DRIVEN    = 0x3,
+    MULTIPLE_SERVICE_SERVER_DRIVEN    = (0x1 << 0),
+    SINGLE_SERVICE_SERVER_DRIVEN      = (0x1 << 1),
+    SINGLE_SERVICE_CLIENT_DRIVEN      = (0x1 << 2),
 } OicSecDpom_t;
 
 typedef enum OicSecSvcType
@@ -435,8 +437,6 @@ struct OicSecDoxm
 
 /**
  * /oic/sec/pstat (Provisioning Status) data type.
- * NOTE: this struct is ahead of Spec v0.95 in definition to include Sm.
- * TODO: change comment when reconciled to Spec v0.96.
  */
 struct OicSecPstat
 {

diff --git a/resource/csdk/security/provisioning/sample/cloud.dat b/resource/csdk/security/provisioning/sample/cloud.dat
index d08f163..bb6e553 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/cloud.dat and b/resource/csdk/security/provisioning/sample/cloud.dat differ

diff --git a/resource/csdk/security/provisioning/sample/cloud.json b/resource/csdk/security/provisioning/sample/cloud.json
index 3ab5914..91b6582 100644 (file)
--- a/resource/csdk/security/provisioning/sample/cloud.json
+++ b/resource/csdk/security/provisioning/sample/cloud.json
@@ -50,8 +50,8 @@
         "isop": true,
         "cm": 0,
         "tm": 0,
-        "om": 3,
-        "sm": 3,
+        "om": 4,
+        "sm": 4,
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
     },

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
index d08f163..bb6e553 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
index 2c8006a..df842bf 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
@@ -50,8 +50,8 @@
         "isop": true,\r
         "cm": 0,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3,\r
+        "om": 4,\r
+        "sm": 4,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     },\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat
index c18658d..22acc32 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
index 4581f5d..952f9be 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
@@ -64,8 +64,8 @@
         "rowneruuid": "",
         "cm": 2,
         "tm": 0,
-        "om": 3,
-        "sm": 3
+        "om": 4,
+        "sm": 4
         },
     "doxm": {
         "oxms": [0, 1],

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat
index fa238ac..82b4e40 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
index e7662c6..16529fa 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
@@ -64,8 +64,8 @@
         "rowneruuid": "6A757374-776F-726B-4465-765575696430",\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/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
index ee20d9a..6349020 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
index aa8d62d..af5b55f 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
@@ -64,8 +64,8 @@
         "rowneruuid": "72616E64-5069-6E44-6576-557569643030",\r
         "cm": 2,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3\r
+        "om": 4,\r
+        "sm": 4\r
         },\r
     "doxm": {\r
         "oxms": [0, 1],\r

diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c
index 5400641..d68e4da 100644 (file)
--- a/resource/csdk/security/provisioning/src/secureresourceprovider.c
+++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c
@@ -2322,7 +2322,7 @@ OCStackResult SRPResetDevice(const OCProvisionDev_t* pTargetDev,
     pstat->isOp = false;
     memcpy(pstat->deviceID.id, pTargetDev->doxm->deviceID.id, sizeof(OicUuid_t));
     pstat->tm = TAKE_OWNER;
-    pstat->om = (OicSecDpom_t)(SINGLE_SERVICE_SERVER_DRIVEN | MULTIPLE_SERVICE_CLIENT_DRIVEN);
+    pstat->om = (OicSecDpom_t)(SINGLE_SERVICE_CLIENT_DRIVEN); // the only mode IoTivity supports currently
     pstat->smLen = 1;
     pstat->sm = (OicSecDpom_t *) OICCalloc(pstat->smLen, sizeof(OicSecDpom_t));
     if (NULL == pstat->sm)
@@ -2331,7 +2331,7 @@ OCStackResult SRPResetDevice(const OCProvisionDev_t* pTargetDev,
         OICFree(pstat);
         return OC_STACK_NO_MEMORY;
     }
-    pstat->sm[0] = (OicSecDpom_t)(SINGLE_SERVICE_SERVER_DRIVEN | MULTIPLE_SERVICE_CLIENT_DRIVEN);
+    pstat->sm[0] = (OicSecDpom_t)(SINGLE_SERVICE_CLIENT_DRIVEN); // the only mode IoTivity supports currently
 
     OCSecurityPayload * secPayload = (OCSecurityPayload *) OICCalloc(1, sizeof(OCSecurityPayload));
     if (!secPayload)

diff --git a/resource/csdk/security/provisioning/unittest/sampleserver1.cpp b/resource/csdk/security/provisioning/unittest/sampleserver1.cpp
index 812f8be..7575811 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/sampleserver1.cpp
+++ b/resource/csdk/security/provisioning/unittest/sampleserver1.cpp
@@ -112,7 +112,7 @@ static uint8_t DEFAULT_SVR_DB[] = {
     0x61, 0x63, 0x6C, 0x62, 0x69, 0x66, 0x81, 0x6F, 0x6F, 0x69, 0x63, 0x2E, 0x69, 0x66, 0x2E, 0x62,
     0x61, 0x73, 0x65, 0x6C, 0x69, 0x6E, 0x65, 0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x9D, 0xA9,
     0x64, 0x69, 0x73, 0x6F, 0x70, 0xF4, 0x62, 0x63, 0x6D, 0x02, 0x62, 0x74, 0x6D, 0x00, 0x62, 0x6F,
-    0x6D, 0x03, 0x62, 0x73, 0x6D, 0x03, 0x6A, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69,
+    0x6D, 0x04, 0x62, 0x73, 0x6D, 0x04, 0x6A, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69,
     0x64, 0x78, 0x24, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x2D, 0x31, 0x31, 0x31, 0x31,
     0x2D, 0x31, 0x31, 0x31, 0x31, 0x2D, 0x31, 0x31, 0x31, 0x31, 0x2D, 0x31, 0x31, 0x31, 0x31, 0x31,
     0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x6A, 0x72, 0x6F, 0x77, 0x6E, 0x65, 0x72, 0x75, 0x75,

diff --git a/resource/csdk/security/provisioning/unittest/sampleserver2.cpp b/resource/csdk/security/provisioning/unittest/sampleserver2.cpp
index 8830cbe..73440e6 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/sampleserver2.cpp
+++ b/resource/csdk/security/provisioning/unittest/sampleserver2.cpp
@@ -112,7 +112,7 @@ static uint8_t DEFAULT_SVR_DB[] = {
     0x61, 0x63, 0x6C, 0x62, 0x69, 0x66, 0x81, 0x6F, 0x6F, 0x69, 0x63, 0x2E, 0x69, 0x66, 0x2E, 0x62,
     0x61, 0x73, 0x65, 0x6C, 0x69, 0x6E, 0x65, 0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x9D, 0xA9,
     0x64, 0x69, 0x73, 0x6F, 0x70, 0xF4, 0x62, 0x63, 0x6D, 0x02, 0x62, 0x74, 0x6D, 0x00, 0x62, 0x6F,
-    0x6D, 0x03, 0x62, 0x73, 0x6D, 0x03, 0x6A, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69,
+    0x6D, 0x04, 0x62, 0x73, 0x6D, 0x04, 0x6A, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69,
     0x64, 0x78, 0x24, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x2D, 0x32, 0x32, 0x32, 0x32,
     0x2D, 0x32, 0x32, 0x32, 0x32, 0x2D, 0x32, 0x32, 0x32, 0x32, 0x2D, 0x32, 0x32, 0x32, 0x32, 0x32,
     0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x6A, 0x72, 0x6F, 0x77, 0x6E, 0x65, 0x72, 0x75, 0x75,

diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c
index 63742c7..244078c 100644 (file)
--- a/resource/csdk/security/src/pstatresource.c
+++ b/resource/csdk/security/src/pstatresource.c
@@ -559,8 +559,8 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest
             }
             validReq = false;
 
-            //Currently, we dose not support the multiple service server driven yet.
-            if (pstat->om != MULTIPLE_SERVICE_SERVER_DRIVEN)
+            //Currently, IoTivity only supports Single Service Client Directed provisioning
+            if (pstat->om == SINGLE_SERVICE_CLIENT_DRIVEN)
             {
                 if ((pstat->cm & RESET) && false == pstat->isOp)
                 {

diff --git a/resource/csdk/security/unittest/oic_svr_db.dat b/resource/csdk/security/unittest/oic_svr_db.dat
index 7758880..d0035f4 100644 (file)
Binary files a/resource/csdk/security/unittest/oic_svr_db.dat and b/resource/csdk/security/unittest/oic_svr_db.dat differ

diff --git a/resource/csdk/security/unittest/oic_svr_db.json b/resource/csdk/security/unittest/oic_svr_db.json
index 31c2763..983db6d 100644 (file)
--- a/resource/csdk/security/unittest/oic_svr_db.json
+++ b/resource/csdk/security/unittest/oic_svr_db.json
@@ -78,8 +78,8 @@
         "rowneruuid": "756E6B6E-6F77-6564-4465-766963654964",
         "cm": 2,
         "tm": 0,
-        "om": 3,
-        "sm": 3
+        "om": 4,
+        "sm": 4
         },
     "doxm": {
         "oxms": [0],

diff --git a/resource/csdk/security/unittest/oic_svr_db_prov.dat b/resource/csdk/security/unittest/oic_svr_db_prov.dat
index 4b5604e..b3b9f6f 100644 (file)
Binary files a/resource/csdk/security/unittest/oic_svr_db_prov.dat and b/resource/csdk/security/unittest/oic_svr_db_prov.dat differ

diff --git a/resource/csdk/security/unittest/oic_svr_db_prov.json b/resource/csdk/security/unittest/oic_svr_db_prov.json
index a24fd3b..534cae9 100644 (file)
--- a/resource/csdk/security/unittest/oic_svr_db_prov.json
+++ b/resource/csdk/security/unittest/oic_svr_db_prov.json
@@ -86,8 +86,8 @@
         "deviceuuid": "646f6f72-4465-7669-6365-555549443030",\r
         "cm": 0,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3,\r
+        "om": 4,\r
+        "sm": 4,\r
         "rowneruuid": "61646d69-6e44-6576-6963-655575696430"\r
     },\r
     "doxm": {\r

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 786371b..c3ca4f7 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

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 956cfb9..a80b096 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
@@ -60,8 +60,8 @@
         "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
         "cm": 0,\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/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 d990587..0632ae7 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

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 d21c6c3..52efc9a 100644 (file)
--- 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
@@ -60,8 +60,8 @@
         "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
         "cm": 0,\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/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 ff1ed14..c929d11 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

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 1b88560..24e28b5 100644 (file)
--- 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
@@ -60,8 +60,8 @@
         "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
         "cm": 0,\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/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat
index 16c0314..59ab281 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

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 999ec09..2537623 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -102,8 +102,8 @@
         "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
         "cm": 0,\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/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 0cbcd16..ff63f1a 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 0124922..14a7e91 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
@@ -65,8 +65,8 @@
         "deviceuuid": "6a757374-776f-726b-4465-765575696430",\r
         "cm": 2,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3,\r
+        "om": 4,\r
+        "sm": 4,\r
         "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
     },\r
     "doxm": {\r

diff --git a/resource/examples/oic_svr_db_client.dat b/resource/examples/oic_svr_db_client.dat
index d990587..0632ae7 100644 (file)
Binary files a/resource/examples/oic_svr_db_client.dat and b/resource/examples/oic_svr_db_client.dat differ

diff --git a/resource/examples/oic_svr_db_client.json b/resource/examples/oic_svr_db_client.json
index 1ba8548..74192f3 100644 (file)
--- a/resource/examples/oic_svr_db_client.json
+++ b/resource/examples/oic_svr_db_client.json
@@ -60,8 +60,8 @@
         "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
         "cm": 0,\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/resource/examples/oic_svr_db_server.dat b/resource/examples/oic_svr_db_server.dat
index a6b3fae..655832a 100644 (file)
Binary files a/resource/examples/oic_svr_db_server.dat and b/resource/examples/oic_svr_db_server.dat differ

diff --git a/resource/examples/oic_svr_db_server.json b/resource/examples/oic_svr_db_server.json
index caf0a70..6dba20e 100644 (file)
--- a/resource/examples/oic_svr_db_server.json
+++ b/resource/examples/oic_svr_db_server.json
@@ -72,8 +72,8 @@
         "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
         "cm": 0,\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/resource/provisioning/examples/cloud.dat b/resource/provisioning/examples/cloud.dat
index d08f163..bb6e553 100644 (file)
Binary files a/resource/provisioning/examples/cloud.dat and b/resource/provisioning/examples/cloud.dat differ

diff --git a/resource/provisioning/examples/cloud.json b/resource/provisioning/examples/cloud.json
new file mode 100644 (file)
index 0000000..91b6582
--- /dev/null
+++ b/resource/provisioning/examples/cloud.json
@@ -0,0 +1,68 @@
+{
+    "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
+                },
+                {
+                    "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
+                }
+            ]
+        },
+        "rowneruuid" : "61646D69-6E44-6576-6963-655575696430"
+    },
+    "pstat": {
+        "isop": true,
+        "cm": 0,
+        "tm": 0,
+        "om": 4,
+        "sm": 4,
+        "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
+        "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
+    },
+    "doxm": {
+        "oxms": [0],
+        "oxmsel": 0,
+        "sct": 1,
+        "owned": true,
+        "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
+        "x.org.iotivity.dpc": false,
+        "devowneruuid": "61646D69-6E44-6576-6963-655575696430",
+        "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
+    }
+}

diff --git a/resource/provisioning/examples/oic_svr_db_client.dat b/resource/provisioning/examples/oic_svr_db_client.dat
index d08f163..bb6e553 100644 (file)
Binary files a/resource/provisioning/examples/oic_svr_db_client.dat and b/resource/provisioning/examples/oic_svr_db_client.dat differ

diff --git a/resource/provisioning/examples/oic_svr_db_client.json b/resource/provisioning/examples/oic_svr_db_client.json
old mode 100755 (executable)
new mode 100644 (file)
index d8fafd0..56e378b
--- a/resource/provisioning/examples/oic_svr_db_client.json
+++ b/resource/provisioning/examples/oic_svr_db_client.json
@@ -52,8 +52,8 @@
         "isop": true,\r
         "cm": 0,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3,\r
+        "om": 4,\r
+        "sm": 4,\r
         "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
         "rowneruuid": "61646D69-6E44-6576-6963-655575696430"\r
     },\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
old mode 100755 (executable)
new mode 100644 (file)
index 6f5b6f6..229c8ad
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 e4aa328..a502b50 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
@@ -66,8 +66,8 @@
         "rowneruuid": "61646d69-6e44-6576-6963-655575696430",
         "cm": 0,
         "tm": 0,
-        "om": 3,
-        "sm": 3
+        "om": 4,
+        "sm": 4
         },
     "doxm": {
         "oxms": [0],

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat
index d990587..0632ae7 100644 (file)
Binary files a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat and b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.dat differ

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
index 1ba8548..74192f3 100644 (file)
--- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
+++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
@@ -60,8 +60,8 @@
         "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
         "cm": 0,\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/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat
index 0c337c5..b5eae8f 100644 (file)
Binary files a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat and b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat differ

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
index 2d5935e..58fd073 100644 (file)
--- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
+++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
@@ -84,8 +84,8 @@
         "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
         "cm": 0,\r
         "tm": 0,\r
-        "om": 3,\r
-        "sm": 3\r
+        "om": 4,\r
+        "sm": 4\r
         },\r
     "doxm": {\r
         "oxms": [0],\r