[IOT-1763] Implemented device onboarding state CR 23 93/17993/13
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Sun, 19 Mar 2017 04:17:19 +0000 (21:17 -0700)
committerGreg Zaverucha <gregz@microsoft.com>
Fri, 24 Mar 2017 21:57:12 +0000 (21:57 +0000)
commit208de8413e7d48a3fa9dd721d5bde41e8e08dbe4
treedeb6ec5a70412ac7769d7e3395449f375389344e
parent13baa549c445d88d7f293003974afe6b21ac0706
[IOT-1763] Implemented device onboarding state CR 23

Added oic.r.pstat Property "dos" as made mandatory by
OCF Security Specification CR 23.

patch set 2: Functional cbor marshalling.

patch set 3: Updated json2cbor tool and every svr.json and
.dat file I could find to use the new pstat.dos property.

patch set 4: Updated json2cbor tool to support oic 1.1 format
but print warning if .dos property not found.

patch set 5: Added better handling for .dat files that don't
contain "dos" Property, to aid in legacy app migration.

patch set 6: Rebase.

patch set 7: Fixed unittest issue that appeared after re-base,
and addressed misc comments on patch set 5.

patch set 8: commit msg fix.

patch set 9: added "TODO" items for UPDATE handling once
other CRs are done.

patch set 10: addressed a few of Kevin's comments.

patch set 11: rebase

patch set 12: addressed Greg's request for specific JIRA numbers.

Change-Id: I6d9751ff1e6d7d88789e1462819736b38f176a53
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17993
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
74 files changed:
java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.json
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.dat
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.json
java/examples-java/provisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-java/simpleclient/src/main/assets/oic_svr_db_client.json
java/examples-java/simpleclientserver/src/main/assets/oic_svr_db_client.json
java/examples-java/simpleserver/src/main/assets/oic_svr_db_server.dat
java/examples-java/simpleserver/src/main/assets/oic_svr_db_server.json
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/sample/cloud.dat
resource/csdk/security/provisioning/sample/cloud.json
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/src/pstatresource.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/security/unittest/oic_svr_db.dat
resource/csdk/security/unittest/oic_svr_db.json
resource/csdk/security/unittest/oic_svr_db_prov.dat
resource/csdk/security/unittest/oic_svr_db_prov.json
resource/csdk/security/unittest/oic_unittest.dat
resource/csdk/security/unittest/oic_unittest.json
resource/csdk/security/unittest/pstatresource.cpp
resource/csdk/stack/samples/linux/secure/README [deleted file]
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
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_client.json
resource/examples/oic_svr_db_client_directpairing.dat
resource/examples/oic_svr_db_client_directpairing.json
resource/examples/oic_svr_db_server.dat
resource/examples/oic_svr_db_server.json
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/examples/linux/secureResourceExample/oic_svr_db_client.dat
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.dat
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json
service/resource-encapsulation/unittests/oic_svr_db_re_client.dat
service/resource-encapsulation/unittests/oic_svr_db_re_client.json