Update db files and Fix json2cbor tool
authorYonggoo Kang <ygace.kang@samsung.com>
Thu, 24 Mar 2016 14:29:21 +0000 (23:29 +0900)
committerRandeep Singh <randeep.s@samsung.com>
Fri, 25 Mar 2016 11:50:42 +0000 (11:50 +0000)
commitf829a81adcc170d1d8d9357a8a20b50aa4ba8cba
tree7e1818e9296e21763406356a22fa1990b98a9d5a
parent8b85e3b4a58282db6abf7a60992140a97c75d9b6
Update db files and Fix json2cbor tool

patch#1 : 1. Update dat/json files.
          2. Fix json2cbor tool about CRED
patch#2 : Rebase to resolve conflict, minor fix
patch#3 : Resolve SVACE issue, check return value

Change-Id: Ibcaa8f2d0588924e42ab8985dac7b15a82579c8c
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6301
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
27 files changed:
android/examples/provisioningclient/src/main/assets/oic_svr_db_client.json
android/examples/simpleclient/src/main/assets/oic_svr_db_client.json
android/examples/simpleserver/src/main/assets/oic_svr_db_server.json [changed mode: 0755->0644]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.dat [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.json [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.dat [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.json [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_pt.dat [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_pt.json [changed mode: 0644->0755]
resource/csdk/security/provisioning/ck_manager/unittest/test_data/CKMInfo.dat
resource/csdk/security/provisioning/ck_manager/unittest/test_data/CKMInfo.json
resource/csdk/security/src/credresource.c
resource/csdk/security/tool/json2cbor.c
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.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client.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_server.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
resource/examples/oic_svr_db_client.json [changed mode: 0755->0644]
resource/examples/oic_svr_db_server.json [changed mode: 0755->0644]
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat [changed mode: 0644->0755]
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.json [new file with mode: 0755]
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_client.json
service/resource-encapsulation/examples/linux/secureResourceExample/oic_svr_db_server.json