projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d2c816) | patch
merge master code to build iotivity
authorhyuna0213.jo <hyuna0213.jo@samsung.com>
Tue, 25 Aug 2015 06:12:39 +0000 (15:12 +0900)
committerJon A. Cruz <jonc@osg.samsung.com>
Tue, 25 Aug 2015 18:55:18 +0000 (18:55 +0000)
commit193ac144d877c161b7118152671693b1c420060f
tree61a3f351d39c6e8cf871c82940e1ac5065fad3b0tree | snapshot
parent4d2c8162893d8e0fb831a075e07c6cdcbdb48c64commit | diff
merge master code to build iotivity

current cloud-interface branch code failed to build iotivity stack.
so I merge latest master code that the build issue is resolved
to build full source code.

Change-Id: I6f6393806f3d4b5c5b861fe61941cea13bb45904
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2265
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jon A. Cruz <jonc@osg.samsung.com>
109 files changed:
auto_build.sh diff | blob | history
build_common/darwin/SConscript diff | blob | history
extlibs/tinydtls/0001-Add-TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256-cipher-su.patch [new file with mode: 0644] blob
extlibs/tinydtls/0001-Fix-the-wrong-implementation-about-the-anonymous-cip.patch [new file with mode: 0644] blob
extlibs/tinydtls/crypto.c diff | blob | history
extlibs/tinydtls/crypto.h diff | blob | history
extlibs/tinydtls/dtls.c diff | blob | history
extlibs/tinydtls/dtls.h diff | blob | history
extlibs/tinydtls/global.h diff | blob | history
extlibs/tinydtls/tests/dtls-client.c diff | blob | history
extlibs/tinydtls/tests/dtls-server.c diff | blob | history
resource/csdk/connectivity/api/cacommon.h diff | blob | history
resource/csdk/connectivity/common/src/caremotehandler.c diff | blob | history
resource/csdk/connectivity/common/src/logger.c diff | blob | history
resource/csdk/connectivity/inc/caadapternetdtls.h diff | blob | history
resource/csdk/connectivity/inc/caipinterface.h diff | blob | history
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c diff | blob | history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c diff | blob | history
resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c diff | blob | history
resource/csdk/connectivity/src/camessagehandler.c diff | blob | history
resource/csdk/connectivity/src/caprotocolmessage.c diff | blob | history
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c diff | blob | history
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_eth.cpp diff | blob | history
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_wifi.cpp diff | blob | history
resource/csdk/connectivity/src/ip_adapter/caipadapter.c diff | blob | history
resource/csdk/connectivity/src/ip_adapter/caipserver.c diff | blob | history
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c diff | blob | history
resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c diff | blob | history
resource/csdk/security/SConscript diff | blob | history
resource/csdk/security/include/internal/amaclresource.h [new file with mode: 0755] blob
resource/csdk/security/include/internal/credresource.h diff | blob | history
resource/csdk/security/include/internal/doxmresource.h diff | blob | history
resource/csdk/security/include/internal/srmresourcestrings.h diff | blob | history
resource/csdk/security/include/internal/svcresource.h [new file with mode: 0644] blob
resource/csdk/security/include/iotvticalendar.h [new file with mode: 0644] blob
resource/csdk/security/include/pbkdf2.h [new file with mode: 0644] blob
resource/csdk/security/include/pinoxmcommon.h [new file with mode: 0644] blob
resource/csdk/security/include/securevirtualresourcetypes.h diff | blob | history
resource/csdk/security/include/srmutility.h diff | blob | history
resource/csdk/security/provisioning/README.txt [new file with mode: 0644] blob
resource/csdk/security/provisioning/SConscript diff | blob | history
resource/csdk/security/provisioning/include/internal/credentialgenerator.h diff | blob | history
resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/internal/secureresourceprovider.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/ocprovisioningmanager.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/oxm/oxmjustworks.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/oxm/oxmrandompin.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/pmtypes.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/pmutility.h [new file with mode: 0644] blob
resource/csdk/security/provisioning/include/provisioningmanager.h [deleted file] blob | history
resource/csdk/security/provisioning/sample/SConscript diff | blob | history
resource/csdk/security/provisioning/sample/oic_svr_db_client.json [new file with mode: 0644] blob
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json [new file with mode: 0644] blob
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json [new file with mode: 0644] blob
resource/csdk/security/provisioning/sample/provisioningclient.c diff | blob | history
resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp [new file with mode: 0644] blob
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/credentialgenerator.c diff | blob | history
resource/csdk/security/provisioning/src/ocprovisioningmanager.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/ownershiptransfermanager.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/oxmjustworks.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/oxmrandompin.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/pmutility.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/src/provisioningmanager.c [deleted file] blob | history
resource/csdk/security/provisioning/src/secureresourceprovider.c [new file with mode: 0644] blob
resource/csdk/security/provisioning/unittest/SConscript diff | blob | history
resource/csdk/security/provisioning/unittest/otmunittest.cpp [new file with mode: 0644] blob
resource/csdk/security/provisioning/unittest/pmutilitytest.cpp [new file with mode: 0644] blob
resource/csdk/security/provisioning/unittest/provisioningmanager.cpp [deleted file] blob | history
resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp [new file with mode: 0644] blob
resource/csdk/security/src/aclresource.c diff | blob | history
resource/csdk/security/src/amaclresource.c [new file with mode: 0644] blob
resource/csdk/security/src/credresource.c diff | blob | history
resource/csdk/security/src/doxmresource.c diff | blob | history
resource/csdk/security/src/iotvticalendar.c [new file with mode: 0644] blob
resource/csdk/security/src/oxmpincommon.c [new file with mode: 0644] blob
resource/csdk/security/src/pbkdf2.c [new file with mode: 0644] blob
resource/csdk/security/src/policyengine.c diff | blob | history
resource/csdk/security/src/psinterface.c diff | blob | history
resource/csdk/security/src/pstatresource.c diff | blob | history
resource/csdk/security/src/resourcemanager.c diff | blob | history
resource/csdk/security/src/secureresourcemanager.c diff | blob | history
resource/csdk/security/src/srmresourcestrings.c diff | blob | history
resource/csdk/security/src/srmutility.c diff | blob | history
resource/csdk/security/src/svcresource.c [new file with mode: 0644] blob
resource/csdk/security/unittest/SConscript diff | blob | history
resource/csdk/security/unittest/aclresourcetest.cpp diff | blob | history
resource/csdk/security/unittest/credentialresource.cpp diff | blob | history
resource/csdk/security/unittest/doxmresource.cpp diff | blob | history
resource/csdk/security/unittest/iotvticalendartest.cpp [new file with mode: 0644] blob
resource/csdk/security/unittest/oic_unittest.json diff | blob | history
resource/csdk/security/unittest/pstatresource.cpp diff | blob | history
resource/csdk/security/unittest/srmtestcommon.cpp [new file with mode: 0644] blob
resource/csdk/security/unittest/srmtestcommon.h [new file with mode: 0644] blob
resource/csdk/security/unittest/srmutility.cpp diff | blob | history
resource/csdk/security/unittest/svcresourcetest.cpp [new file with mode: 0644] blob
resource/csdk/stack/samples/linux/secure/occlientbasicops.h diff | blob | history
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp diff | blob | history
resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json diff | blob | history
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json diff | blob | history
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec diff | blob | history
resource/csdk/stack/src/ocserverrequest.c diff | blob | history
resource/csdk/stack/src/ocstack.c diff | blob | history
resource/csdk/stack/src/oicgroup.c diff | blob | history
resource/include/OCPlatform.h diff | blob | history
resource/include/OCPlatform_impl.h diff | blob | history
service/resource-encapsulation/src/resourceBroker/include/DevicePresence.h diff | blob | history
service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp diff | blob | history
service/resource-encapsulation/src/resourceContainer/SConscript diff | blob | history
Domain: Network & Connectivity / IoT Connectivity;