[IOT-1895] [IOT-2179] [IOT-1957] /acl2 Resource 93/19593/21
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Wed, 3 May 2017 07:59:24 +0000 (00:59 -0700)
committerRandeep Singh <randeep.s@samsung.com>
Sat, 13 May 2017 09:53:58 +0000 (09:53 +0000)
commit96bbf077b5092cce21a081d08f26912966b0e4dd
tree23c6d93fc8a1302959890517034881803ef7b301
parent40b6bca8ac5c5c103516fc7e54a55ff9832e1c8c
[IOT-1895] [IOT-2179] [IOT-1957] /acl2 Resource

ACE2 adds the "wc" property to the "resource" type, and the
"conntype" property to the "subject" type, allowing for more
flexible wildcards, and removing possible unintended collisions.

/acl2 also conforms to a different schema, so the CBOR encode/
decode functions are updated.

The unit tests are currently still using oic.sec.ace structures,
and will need to be updated to oic.sec.ace2 (see IOT-2192)

Updated provisiongclient and provisioning .json/.dat files to
use /acl2.

[x] update OicSecAce_t to support ace2
[x] update OicSecResource_t to support */+/- rsrc wildcards
[x] update AclToCBORPayload() to support /acl2
[x] update JSONToAclBin() to support /acl2
[x] update CBORPayloadToAcl() to support /acl2
[x] remove /oic/sec/acl resource
[x] verify provclient/justworks using above revisions
[x] verify unitttest using above revisions

Change-Id: If5a7105ac223537cd2249cec519e5657f651da3e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19593
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
38 files changed:
resource/csdk/security/include/internal/aclresource.h
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
resource/csdk/security/provisioning/sample/oic_svr_db_client.json
resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat
resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat
resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/dpairingresource.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/provisioning/examples/cloud.dat
resource/provisioning/examples/cloud.json
resource/provisioning/examples/oic_svr_db_client.dat
resource/provisioning/examples/oic_svr_db_client.json
resource/provisioning/examples/oic_svr_db_subowner_client.dat
resource/provisioning/examples/oic_svr_db_subowner_client.json
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json
service/resource-encapsulation/unittests/oic_svr_db_re_client.dat
service/resource-encapsulation/unittests/oic_svr_db_re_client.json