Merge branch '1.3-rel' (5c831e6) 79/22479/5
authorGeorge Nash <george.nash@intel.com>
Fri, 15 Sep 2017 17:51:48 +0000 (10:51 -0700)
committerGeorge Nash <george.nash@intel.com>
Mon, 18 Sep 2017 17:20:31 +0000 (10:20 -0700)
commit9929e70d0e12ac9a802388b68c9a4353f34d587f
tree586d944672ad9592455686597323fe3892c5ac54
parent0a4fdaaa9978398b91923676cee05c2f7c9a437e
parent9d657f1c91d233cd7b0822f54d68523f725131d9
Merge branch '1.3-rel' (5c831e6)

Relate-to:
https://gerrit.iotivity.org/gerrit/22125
https://gerrit.iotivity.org/gerrit/22291
https://gerrit.iotivity.org/gerrit/21917
https://gerrit.iotivity.org/gerrit/22173
https://gerrit.iotivity.org/gerrit/22153
https://gerrit.iotivity.org/gerrit/22379
https://gerrit.iotivity.org/gerrit/22377
https://gerrit.iotivity.org/gerrit/22331
https://gerrit.iotivity.org/gerrit/21915
https://gerrit.iotivity.org/gerrit/22391
https://gerrit.iotivity.org/gerrit/21899
https://gerrit.iotivity.org/gerrit/22315
https://gerrit.iotivity.org/gerrit/22401
https://gerrit.iotivity.org/gerrit/20323
https://gerrit.iotivity.org/gerrit/22279
https://gerrit.iotivity.org/gerrit/22013
https://gerrit.iotivity.org/gerrit/22447

Conflicts:
    .gitignore
    java/jni/SConscript
    resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
    resource/csdk/security/provisioning/sample/SConscript
    resource/csdk/security/src/doxmresource.c
    resource/provisioning/examples/SConscript
    resource/provisioning/unittests/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I38edf767568c80aad54c0c97e9b32581e31f4942
Signed-off-by: George Nash <george.nash@intel.com>
63 files changed:
.gitignore
java/jni/JniOcResource.h
resource/IPCA/unittests/IPCAUnitTest.dat
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/src/caconnectivitymanager.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/src/ip_adapter/caipadapter.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/include/octypes.h
resource/csdk/logger/src/logger.c
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
resource/csdk/security/provisioning/sample/oic_svr_db_server_mfg.dat
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/oxmjustworks.c
resource/csdk/security/provisioning/src/oxmmanufacturercert.c
resource/csdk/security/provisioning/src/oxmpreconfpin.c
resource/csdk/security/provisioning/src/oxmrandompin.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/certhelpers.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/directpairing.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/dpairingresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/oic_svr_db_prov.dat
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/SConscript
resource/csdk/stack/test/stacktests.cpp
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_server.dat
resource/provisioning/examples/SConscript
resource/provisioning/unittests/SConscript
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/resourcehandler.c
service/easy-setup/enrollee/src/resourcehandler.h
service/easy-setup/enrollee/unittests/ESEnrolleeTest.cpp
service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
service/easy-setup/mediator/richsdk/src/CloudResource.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp
service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c