From 7a96f668a07fd5621fa148b53efb770f4bc24a1e Mon Sep 17 00:00:00 2001 From: Jongmin Choi Date: Wed, 23 Nov 2016 16:41:01 +0900 Subject: [PATCH] Remove x.org.iotivity from secure resources Remove x.org.iotivity from IoTivity secure resources Patch #1: Initial upload Change-Id: Icb067cc8a44d365665ef26e3955f6f79fa12415c Signed-off-by: Jongmin Choi Reviewed-on: https://gerrit.iotivity.org/gerrit/14641 Tested-by: jenkins-iotivity Reviewed-by: Chul Lee Reviewed-by: Uze Choi Reviewed-by: Phil Coval Reviewed-by: Randeep Singh (cherry picked from commit 7704a4d2318cf63bccb3fc09c9e8ca9cb8eaf0c7) Reviewed-on: https://gerrit.iotivity.org/gerrit/14663 --- .../src/main/assets/oic_svr_db_client.dat | Bin 1046 -> 974 bytes .../src/main/assets/oic_svr_db_client.json | 1 - .../src/main/assets/oic_svr_db_client.dat | Bin 879 -> 859 bytes .../src/main/assets/oic_svr_db_client.json | 1 - .../src/main/assets/oic_svr_db_client.dat | Bin 1112 -> 1092 bytes .../src/main/assets/oic_svr_db_client.json | 3 +-- .../src/main/assets/oic_svr_db_server.dat | Bin 1369 -> 1349 bytes .../src/main/assets/oic_svr_db_server.json | 3 +-- resource/csdk/security/provisioning/sample/cloud.dat | Bin 879 -> 859 bytes .../csdk/security/provisioning/sample/cloud.json | 1 - .../provisioning/sample/oic_svr_db_client.dat | Bin 3269 -> 859 bytes .../provisioning/sample/oic_svr_db_client.json | 1 - .../oic_svr_db_randompin_with_empty_deviceid.dat | Bin 998 -> 978 bytes .../oic_svr_db_randompin_with_empty_deviceid.json | 3 +-- .../sample/oic_svr_db_server_justworks.dat | Bin 997 -> 977 bytes .../sample/oic_svr_db_server_justworks.json | 3 +-- .../sample/oic_svr_db_server_randompin.dat | Bin 998 -> 978 bytes .../sample/oic_svr_db_server_randompin.json | 3 +-- .../sample/oic_svr_db_subowner_client.dat | Bin 1046 -> 1027 bytes .../sample/oic_svr_db_subowner_client.json | 1 - resource/csdk/security/src/doxmresource.c | 19 ------------------- resource/csdk/security/src/srmresourcestrings.c | 10 +++++----- resource/csdk/security/tool/json2cbor.c | 8 -------- resource/csdk/security/unittest/oic_svr_db.dat | Bin 1105 -> 1085 bytes resource/csdk/security/unittest/oic_svr_db.json | 3 +-- resource/csdk/security/unittest/oic_svr_db_prov.dat | Bin 1312 -> 1356 bytes resource/csdk/security/unittest/oic_svr_db_prov.json | 3 +-- .../csdk/stack/samples/linux/secure/oic_amss_db.dat | Bin 1170 -> 1150 bytes .../csdk/stack/samples/linux/secure/oic_amss_db.json | 3 +-- .../linux/secure/oic_svr_db_client_devowner.dat | Bin 1170 -> 1150 bytes .../linux/secure/oic_svr_db_client_devowner.json | 3 +-- .../linux/secure/oic_svr_db_client_directpairing.dat | Bin 996 -> 977 bytes .../secure/oic_svr_db_client_directpairing.json | 3 +-- .../linux/secure/oic_svr_db_client_nondevowner.dat | Bin 1170 -> 1150 bytes .../linux/secure/oic_svr_db_client_nondevowner.json | 3 +-- .../stack/samples/linux/secure/oic_svr_db_server.dat | Bin 1827 -> 1807 bytes .../samples/linux/secure/oic_svr_db_server.json | 3 +-- .../linux/secure/oic_svr_db_server_justworks.dat | Bin 997 -> 977 bytes .../linux/secure/oic_svr_db_server_justworks.json | 3 +-- resource/examples/oic_svr_db_client.dat | Bin 1170 -> 1150 bytes resource/examples/oic_svr_db_client.json | 3 +-- .../examples/oic_svr_db_client_directpairing.dat | Bin 996 -> 977 bytes .../examples/oic_svr_db_client_directpairing.json | 3 +-- resource/examples/oic_svr_db_server.dat | Bin 1261 -> 1241 bytes resource/examples/oic_svr_db_server.json | 3 +-- resource/provisioning/examples/cloud.dat | Bin 879 -> 859 bytes resource/provisioning/examples/cloud.json | 1 - resource/provisioning/examples/oic_svr_db_client.dat | Bin 879 -> 859 bytes .../provisioning/examples/oic_svr_db_client.json | 1 - .../app/src/main/assets/oic_svr_db_client.dat | Bin 1000 -> 980 bytes .../app/src/main/assets/oic_svr_db_client.json | 3 +-- .../secureResourceExample/oic_svr_db_client.dat | Bin 1170 -> 1150 bytes .../secureResourceExample/oic_svr_db_client.json | 3 +-- .../secureResourceExample/oic_svr_db_server.dat | Bin 1369 -> 1349 bytes .../secureResourceExample/oic_svr_db_server.json | 3 +-- 55 files changed, 24 insertions(+), 77 deletions(-) mode change 100755 => 100644 android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat mode change 100755 => 100644 android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json diff --git a/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat b/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat old mode 100755 new mode 100644 index 4b5b91881ba480a4828e70405952a02ec9c50892..91be3ca7d9f3c84ecd55e038fdd81d7f4ee3f4b1 GIT binary patch delta 178 zcmbQnagN<^e{y1SP9&4dk~AQlSzNL(B{4a*xM^{AacNRkYH~?wX=X~IR%TIZaeiqL zP^NXF;mV2g*u>KH^D~q66H}6kN*XhPOuh1Ky~LEsiHwqy?=iB;=Yge*Q-Mlyfd+$A zWrI`|>4Et`b*_`y7#k+*F(nBkCFe3FmExXd73VTfp1@={c`dWyWF}@UrmOoW P>oISbEW)VF^#4Bq+(AKY delta 199 zcmX@dK8?e0e{y1SP9#(1k~AQlSzNL(B{4a*xOs7QacNRkYH~?wX=X~IR%TIZaeiqL zNM@qp%E`WrYbHlBD#+*Q=VvDC7pErc7bNHBr6m=WG-d-u^osPr{E6S>RSV%tQVJ3? zi!$@lL8|f~s$fEsuQ0Yx&So+cNJ`FSNGbv1{9NXw;#}s*bC{x;UaXq@lWBuUQH5T9 YQMz7ceo1CoW=W-9NCwzf3k`Rs{eu%MULA 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 859aeb6..29fd2bd 100644 --- a/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json +++ b/android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json @@ -63,7 +63,6 @@ "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/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.dat index c6c73ed4571712475f1f1e62f04ed77c4a82d82b..3a61974c70fb07f37b6621f58ac1e25478096e54 100644 GIT binary patch delta 18 acmcb?afD+-3lrnj$*oKqH+wPjF#-Tbp9Yfv delta 39 vcmX@Yaf4$+3lrnZ$*oKqMT#o)@{7{-GV@C^%Q8zU^->Cwzic*R=3@i^JS`6o 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 a320bcc..0cce3d9 100644 --- a/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json +++ b/android/examples/simpleclient/src/main/assets/oic_svr_db_client.json @@ -64,8 +64,7 @@ "owned": true, "deviceuuid": "32323232-3232-3232-3232-323232323232", "devowneruuid": "32323232-3232-3232-3232-323232323232", - "rowneruuid": "32323232-3232-3232-3232-323232323232", - "x.org.iotivity.dpc": false + "rowneruuid": "32323232-3232-3232-3232-323232323232" }, "cred": { "creds": [ 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 b5eae8faf92f96df4932d6436b8ebbd5604cf3fa..1c6c9e12ed65a00387217eaf838a1d94f0e22096 100644 GIT binary patch delta 21 dcmcb~b(CvED>LKO$!*LVC;KrfPtId`4FF&M2!j9s delta 42 ycmX@gb(3pDD>LKE$!*LVMT#o)@{7{-GV@C^%Q8zU^->CwzfAUHRGu8g@)`hdA`t%o 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 58fd073..776cccd 100644 --- a/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json +++ b/android/examples/simpleserver/src/main/assets/oic_svr_db_server.json @@ -94,8 +94,7 @@ "owned": true, "deviceuuid": "31313131-3131-3131-3131-313131313131", "devowneruuid": "32323232-3232-3232-3232-323232323232", - "rowneruuid": "31313131-3131-3131-3131-313131313131", - "x.org.iotivity.dpc": false + "rowneruuid": "31313131-3131-3131-3131-313131313131" }, "cred": { "creds": [ diff --git a/resource/csdk/security/provisioning/sample/cloud.dat b/resource/csdk/security/provisioning/sample/cloud.dat index bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 GIT binary patch delta 17 ZcmaFQcAITO3lrnj$*oKqCwnog0suot2D1PF delta 38 ucmcc3_MUA+3lrnZ$*oKqMT#o)@{7{-GV@C^%Q8zU^->Cwzf3k`Rs{eu%MULA diff --git a/resource/csdk/security/provisioning/sample/cloud.json b/resource/csdk/security/provisioning/sample/cloud.json index 91b6582..7f6e747 100644 --- a/resource/csdk/security/provisioning/sample/cloud.json +++ b/resource/csdk/security/provisioning/sample/cloud.json @@ -61,7 +61,6 @@ "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/csdk/security/provisioning/sample/oic_svr_db_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat index c8a6af4d47f7f4ff1bdc4c366fa653d6d808b1f7..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 GIT binary patch delta 25 hcmX>qd7F)K|K|Iw%}k6}C*S7QoZQ3FF?j)xDgcWz3MT*n literal 3269 zcmeHIe@q)y9PeEVYz)Yj#t>O>EHj#o^?0S%qlK8k7{A1gM3_>e!u9U8z0&q>cUOM6 zWs^>4oG#A9XmrlP=vW{||Byd6GB;5&F*?a&LU0-vV@z;Ur(`6i%fR=p6bgf_n@0c8 zHuv89zW2WG`}uy~_w#+nc}|ABBV{ZC@jwanx^OS>M2ix1dLgFNu@*5V#?DyK$Z9RJq9JVo9;~T$NN|N$3OaoP$FnMXjK{5mmfad{_-J%o&+9qApoiRod$izMr^RyVvhYyxLef3*UYQHO01J=Bx@fvuLfCI zNY6;CXZ=br;5Hk<8a%TqBfYM?GOs@9%quSg_ho0A8M7JCW*R}aJdvGgNfZ&1B~LZp zbgEH1bsKCII5>yi7(<^-w15K`Q`58vki={#^hBC|tIklq`gHZfC6?bxj+|>=f2uhD zvh7ff{e@RYzR!}%pDArPbg{`69`Z+a}+%<**U<&026)2;i+IYw^Tp@3QfVZ1y$j~MmuyQ6#AuzjaMI6J~>BMW%*XTec zxnB24MMK|~(H-4=U%avZ#N-j*$0x-rpWjpS)UW5CufF_2SuNUf`23i%?uRpb^MCw( zOZH1|IVLWSTs?DrdV9D+biSkX@ASX`C-OqTt%?FiDUhS$6BLiI;mipttQ$&xm%B-l z1wSiyG;vT?TaeJos!+?NTc4t3T4M)jBMHKgr*_e=ygZQA7#)lbzcyU8xvTc)>0X*_ zy)-ab&>YSYyW;tWg5JID?+E+xS?Z99)L}Qx)50f8svrhfU$V|Ph_4W3M$s3Xr45mI zKmQ7C3TeBgaGo|X@gGF8JZ*aDtLthy_)E`aPEHNx-|&)U(XT%mpE$THlv8=*$v<>c zD_?)`!v^KOn#bC&m_%pQBhhn1Bd5NpiXJE`K55B1-GfR9$iTEQ8d89sAZ8MSt*_RB z3Y6*ZKb;yWB_9tPukF5f^3Ak^yRFw-HcR{VeD;7jtk&fZka_jRpVpn&x3zz|pZaC* z+GCN@?|S>*-eYMS_YQAZo9i!`&vqZqc2y24Y7@tLWw9*)u5* zF`Z-z^T#Q;Iz=oBF3QO&&?f{S$8tUgaUtSDy`ZSwJj+2P)Uz-_1sN)0P(~~JBfLk3 zE>8hErU1>(S!ipau!t-Ovle_lWYgCiQ*dbtJl^iX>u5WM6Iu*MTSV~Wn{=f_UFr6^ zUJ1&6K~WH$$YtFL#nAaRbg1SO@M61v&L^4D#HFG(?^$3@S5j0~#mX(%Lz#-n%V{U# zTX3<-JPp{27H644_qNo%Ld|;P(LP>KL}|*&`E^beeWKssRQv`nuRTl2Kizi)@pggW zaeNym`f;ap>Rh;kJ{_lUDhY9}^HX;W)Q3Dvph+^(ykpa 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 952f9be..2bd928a 100644 --- 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 @@ -74,7 +74,6 @@ "owned": false, "deviceuuid": "", "devowneruuid": "", - "rowneruuid": "", - "x.org.iotivity.dpc": true + "rowneruuid": "" } } 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 82b4e405784448301d84ff7e1297ab39ee68ff01..135d7b343bf6d4cf9596ec39bce200b9a1ac4f71 100644 GIT binary patch delta 21 dcmaFLevy5{FDAyTlYcX9oP2?aW%3bbMF4Qw32XoW delta 38 ucmcb}{*-;gFDAy9lYcX96e+6E%P&gT%gisyEXypZ)JrKy{yKRLvnl{hv=D#* 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 16529fa..6786580 100644 --- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json +++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json @@ -74,7 +74,6 @@ "owned": false, "deviceuuid": "6A757374-776F-726B-4465-765575696430", "devowneruuid": "", - "rowneruuid": "6A757374-776F-726B-4465-765575696430", - "x.org.iotivity.dpc": true + "rowneruuid": "6A757374-776F-726B-4465-765575696430" } } 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 63490209b6bc39c969a663bcdf948ca54ac95a47..725a56e7b27c720f86ff852d5ce922112e93c5e4 100644 GIT binary patch delta 21 dcmaFHeu;ga 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 af5b55f..f39b06c 100644 --- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json +++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json @@ -74,7 +74,6 @@ "owned": false, "deviceuuid": "72616E64-5069-6E44-6576-557569643030", "devowneruuid": "", - "rowneruuid": "72616E64-5069-6E44-6576-557569643030", - "x.org.iotivity.dpc": true + "rowneruuid": "72616E64-5069-6E44-6576-557569643030" } } diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat index 36568cdb5826ee13dc95453c564a54970ebb41fa..ae130bcc4f4e06a3f292ad681485c04c27970329 100644 GIT binary patch delta 21 dcmbQn(af{>ggG8zze|Dl`564**Y-2i^bx delta 39 vcmZqXn8vX|hneZcs>yoH8$^mK^zw_+^)mBIGRrbcD)mwdlD|y8$E*SX9peur diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json index 977cf87..eba0cdd 100644 --- a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json +++ b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json @@ -79,7 +79,6 @@ "sct": 1, "owned": true, "deviceuuid": "5375624F-776E-6572-436C-69656E743030", - "x.org.iotivity.dpc": false, "devowneruuid": "5375624F-776E-6572-436C-69656E743030", "rowneruuid": "5375624F-776E-6572-436C-69656E743030" } diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c index 1a42753..b16f974 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -305,13 +305,6 @@ OCStackResult DoxmToCBORPayload(const OicSecDoxm_t *doxm, uint8_t **payload, siz OICFree(strUuid); strUuid = NULL; - //x.org.iotivity.dpc -- not Mandatory(vendor-specific), but this type is boolean, so instance always has a value. - cborEncoderResult = cbor_encode_text_string(&doxmMap, OIC_JSON_DPC_NAME, - strlen(OIC_JSON_DPC_NAME)); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding DPC Tag."); - cborEncoderResult = cbor_encode_boolean(&doxmMap, doxm->dpc); - VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding DPC Value."); - //RT -- Mandatory CborEncoder rtArray; cborEncoderResult = cbor_encode_text_string(&doxmMap, OIC_JSON_RT_NAME, @@ -526,18 +519,6 @@ static OCStackResult CBORPayloadToDoxmBin(const uint8_t *cborPayload, size_t siz doxm->owned = gDoxm->owned; } - cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_DPC_NAME, &doxmMap); - if (CborNoError == cborFindResult && cbor_value_is_boolean(&doxmMap)) - { - cborFindResult = cbor_value_get_boolean(&doxmMap, &doxm->dpc); - VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding DPC Value.") - } - else // PUT/POST JSON may not have dpc so set it to the gDomx->dpc - { - VERIFY_NON_NULL(TAG, gDoxm, ERROR); - doxm->dpc = gDoxm->dpc; - } - cborFindResult = cbor_value_map_find_value(&doxmCbor, OIC_JSON_DEVICE_ID_NAME, &doxmMap); if (CborNoError == cborFindResult && cbor_value_is_text_string(&doxmMap)) { diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c index 5d45549..9dd8ffe 100644 --- a/resource/csdk/security/src/srmresourcestrings.c +++ b/resource/csdk/security/src/srmresourcestrings.c @@ -95,13 +95,13 @@ const char * OIC_JSON_OWNERS_NAME = "ownrs"; const char * OIC_JSON_OWNER_NAME = "ownr"; const char * OIC_JSON_DEVOWNERID_NAME = "devowneruuid"; #ifdef _ENABLE_MULTIPLE_OWNER_ -const char * OIC_JSON_SUBOWNERID_NAME = "x.org.iotivity.subowneruuid"; +const char * OIC_JSON_SUBOWNERID_NAME = "subowneruuid"; #endif //_ENABLE_MULTIPLE_OWNER_ const char * OIC_JSON_OWNED_NAME = "owned"; const char * OIC_JSON_OXM_NAME = "oxm"; const char * OIC_JSON_OXMS_NAME = "oxms"; #ifdef _ENABLE_MULTIPLE_OWNER_ -const char * OIC_JSON_MOM_NAME = "x.org.iotivity.mom"; +const char * OIC_JSON_MOM_NAME = "mom"; #endif //_ENABLE_MULTIPLE_OWNER_ const char * OIC_JSON_OXM_TYPE_NAME = "oxmtype"; const char * OIC_JSON_OXM_SEL_NAME = "oxmsel"; @@ -131,7 +131,7 @@ const char * OIC_JSON_PERIODS_NAME = "prds"; const char * OIC_JSON_CRMS_NAME = "crms"; const char * OIC_JSON_RECURRENCES_NAME = "recurrence"; const char * OIC_JSON_SUPPORTED_CRED_TYPE_NAME = "sct"; -const char * OIC_JSON_DPC_NAME = "x.org.iotivity.dpc"; +const char * OIC_JSON_DPC_NAME = "dpc"; const char * OIC_JSON_EDP_NAME = "edp"; const char * OIC_JSON_PIN_NAME = "pin"; const char * OIC_JSON_PDACL_NAME = "pdacl"; @@ -147,7 +147,7 @@ const char * OIC_JSON_RT_NAME = OC_RSRVD_RESOURCE_TYPE; const char * OIC_JSON_IF_NAME = OC_RSRVD_INTERFACE; const char * OIC_JSON_ROWNERID_NAME = "rowneruuid"; #ifdef _ENABLE_MULTIPLE_OWNER_ -const char * OIC_JSON_EOWNERID_NAME = "x.org.iotivity.eowneruuid"; +const char * OIC_JSON_EOWNERID_NAME = "eowneruuid"; #endif //_ENABLE_MULTIPLE_OWNER_ const char * OIC_JSON_ENCODING_NAME = "encoding"; const char * OIC_JSON_DATA_NAME = "data"; @@ -174,7 +174,7 @@ const char * OXM_JUST_WORKS = "oic.sec.doxm.jw"; const char * OXM_RANDOM_DEVICE_PIN = "oic.sec.doxm.rdp"; const char * OXM_MANUFACTURER_CERTIFICATE = "oic.sec.doxm.mfgcert"; #ifdef _ENABLE_MULTIPLE_OWNER_ -const char * OXM_PRECONF_PIN = "x.org.iotivity.doxm.pcp"; +const char * OXM_PRECONF_PIN = "oic.sec.doxm.pcp"; #endif //_ENABLE_MULTIPLE_OWNER_ //Credential data encoding methods diff --git a/resource/csdk/security/tool/json2cbor.c b/resource/csdk/security/tool/json2cbor.c index 09024f8..9528634 100644 --- a/resource/csdk/security/tool/json2cbor.c +++ b/resource/csdk/security/tool/json2cbor.c @@ -609,14 +609,6 @@ OicSecDoxm_t* JSONToDoxmBin(const char * jsonStr) doxm->owned = jsonObj->valueint; } - //DPC -- Mandatory - jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_DPC_NAME); - if (jsonObj) - { - VERIFY_SUCCESS(TAG, (cJSON_True == jsonObj->type || cJSON_False == jsonObj->type), ERROR); - doxm->dpc = jsonObj->valueint; - } - #ifdef _ENABLE_MULTIPLE_OWNER_ //mom -- Not Mandatory jsonObj = cJSON_GetObjectItem(jsonDoxm, OIC_JSON_MOM_NAME); diff --git a/resource/csdk/security/unittest/oic_svr_db.dat b/resource/csdk/security/unittest/oic_svr_db.dat index d0035f47af26548eb83224dfd855671961755eec..56af560f853f19552b3325a05f5c0c2a07350092 100644 GIT binary patch delta 17 Zcmcb}v6o{*8Z+b7$?41+C+o1N0suWi1|$Fg delta 38 ucmdnXagk#~8Z+a|$?41+MT#o)@{7{-GV@C^%Q8zU^->CwzfP85Q3U`aaSovX diff --git a/resource/csdk/security/unittest/oic_svr_db.json b/resource/csdk/security/unittest/oic_svr_db.json index 983db6d..00fdea4 100644 --- a/resource/csdk/security/unittest/oic_svr_db.json +++ b/resource/csdk/security/unittest/oic_svr_db.json @@ -88,7 +88,6 @@ "owned": false, "deviceuuid": "756E6B6E-6F77-6564-4465-766963654964", "devowneruuid": "", - "rowneruuid": "756E6B6E-6F77-6564-4465-766963654964", - "x.org.iotivity.dpc": true + "rowneruuid": "756E6B6E-6F77-6564-4465-766963654964" } } \ No newline at end of file diff --git a/resource/csdk/security/unittest/oic_svr_db_prov.dat b/resource/csdk/security/unittest/oic_svr_db_prov.dat index b3b9f6fcfdc395fbb2f4f856845451fcebaa974b..69dcf23d501b746d1fac976c8cf38d87d4bc0716 100644 GIT binary patch delta 80 zcmZ3$b%txhQ6|Q#laDcNocxD{d-6191;!PVw=?%KE}iVg;-ZvQP@0sJnVgbXlDH@Z jL5-Vz+7 delta 58 zcmV-A0LA~z3ZM$G#R388lg0wE6mobjZ*pfYX>W9Cc4>5ZE@W_H^pkf3D*TVUaXq@hiQXIQH5T9QMz7c Ueo1CoW=W-9NJ;VqAYTVUaXq@hiQXIQH5T9QMz7c Ueo1CoW=W-9NCwzfAUHRG$2f`85Dp*bv|V diff --git a/resource/examples/oic_svr_db_server.json b/resource/examples/oic_svr_db_server.json index 6dba20e..b425999 100644 --- a/resource/examples/oic_svr_db_server.json +++ b/resource/examples/oic_svr_db_server.json @@ -82,8 +82,7 @@ "owned": true, "deviceuuid": "31313131-3131-3131-3131-313131313131", "devowneruuid": "32323232-3232-3232-3232-323232323232", - "rowneruuid": "31313131-3131-3131-3131-313131313131", - "x.org.iotivity.dpc": false + "rowneruuid": "31313131-3131-3131-3131-313131313131" }, "cred": { "creds": [ diff --git a/resource/provisioning/examples/cloud.dat b/resource/provisioning/examples/cloud.dat index bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 GIT binary patch delta 17 ZcmaFQcAITO3lrnj$*oKqCwnog0suot2D1PF delta 38 ucmcc3_MUA+3lrnZ$*oKqMT#o)@{7{-GV@C^%Q8zU^->Cwzf3k`Rs{eu%MULA diff --git a/resource/provisioning/examples/cloud.json b/resource/provisioning/examples/cloud.json index 91b6582..7f6e747 100644 --- a/resource/provisioning/examples/cloud.json +++ b/resource/provisioning/examples/cloud.json @@ -61,7 +61,6 @@ "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 bb6e553d190d73c9ce109646ed3622cfc3cd0cd3..a7549d1ebb0408199ac48fafe2438c26d6bcafaa 100644 GIT binary patch delta 17 ZcmaFQcAITO3lrnj$*oKqCwnog0suot2D1PF delta 38 ucmcc3_MUA+3lrnZ$*oKqMT#o)@{7{-GV@C^%Q8zU^->Cwzf3k`Rs{eu%MULA diff --git a/resource/provisioning/examples/oic_svr_db_client.json b/resource/provisioning/examples/oic_svr_db_client.json index 56e378b..15a0afc 100644 --- a/resource/provisioning/examples/oic_svr_db_client.json +++ b/resource/provisioning/examples/oic_svr_db_client.json @@ -63,7 +63,6 @@ "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/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 229c8ad7beb393e72f85e8a220ffcbb020af3e3f..6b2e14947d5c7199b0a8ffcfe945ceb177c7a6f8 100644 GIT binary patch delta 24 gcmaFCeuaI*Una(@lm9VooNU0vGI=7SJk$UG0EvkTp#T5? delta 38 ucmcb@{(^nOUna(vlm9Vo6e+6E%P&gT%gisyEXypZ)JrKy{xW$zvnl{jO%RR% 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 a502b50..24857ce 100644 --- 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 @@ -76,7 +76,6 @@ "owned": true, "deviceuuid": "61646d69-6e44-6576-6963-655575696430", "devowneruuid": "61646d69-6e44-6576-6963-655575696430", - "rowneruuid": "61646d69-6e44-6576-6963-655575696430", - "x.org.iotivity.dpc": false + "rowneruuid": "61646d69-6e44-6576-6963-655575696430" } } 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 0632ae79e5d8834f134351e6a6ade47d130e8f31..8574d700ddc9bafe756e75a56daead71d22cfeea 100644 GIT binary patch delta 25 hcmbQl`Hy46J|@PillL=ioSetPJvow5V)An4*8qsL3Mv2q delta 39 vcmeyzF^O}-J|@POllL=i6e+6E%P&gT%gisyEXypZ)JrKy{<67%nU4_wN;eO( 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 74192f3..43d07b9 100644 --- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json +++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json @@ -70,8 +70,7 @@ "owned": true, "deviceuuid": "32323232-3232-3232-3232-323232323232", "devowneruuid": "32323232-3232-3232-3232-323232323232", - "rowneruuid": "32323232-3232-3232-3232-323232323232", - "x.org.iotivity.dpc": false + "rowneruuid": "32323232-3232-3232-3232-323232323232" }, "cred": { "creds": [ 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 b5eae8faf92f96df4932d6436b8ebbd5604cf3fa..1c6c9e12ed65a00387217eaf838a1d94f0e22096 100644 GIT binary patch delta 21 dcmcb~b(CvED>LKO$!*LVC;KrfPtId`4FF&M2!j9s delta 42 ycmX@gb(3pDD>LKE$!*LVMT#o)@{7{-GV@C^%Q8zU^->CwzfAUHRGu8g@)`hdA`t%o 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 58fd073..776cccd 100644 --- a/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json +++ b/service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json @@ -94,8 +94,7 @@ "owned": true, "deviceuuid": "31313131-3131-3131-3131-313131313131", "devowneruuid": "32323232-3232-3232-3232-323232323232", - "rowneruuid": "31313131-3131-3131-3131-313131313131", - "x.org.iotivity.dpc": false + "rowneruuid": "31313131-3131-3131-3131-313131313131" }, "cred": { "creds": [ -- 2.7.4