Merging security-M3 to master
authorSachin Agrawal <sachin.agrawal@intel.com>
Thu, 4 Jun 2015 16:51:01 +0000 (09:51 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Thu, 4 Jun 2015 23:51:56 +0000 (23:51 +0000)
commit809b1b1e9be15724a6d756b403328a95894e639f
treeb6155c681c5c8745e074fba3a1b3a539de0287d5
parent4135975810259ab0404800684bb19aecfb888bba
Merging security-M3 to master

Added support for resource access control, anonymous ECDH,
and Just Works Provisioning.

Patch 1 : Squashed all security-M3 patches and rebased to
          common ancestor of security-M3 and master.
Patch 2 : Rebased to master. (Arduino build fails).
Patch 3-4 : Fix the unit test failures.
Patch 5 : Fix the previsioning server send request issue
          by adding token length.
Patch 6 : Fixed Arduino compilation.
Patch 7 : Fixed DTLS handshake issue.
Patch 8 : Fix the build issue.
Patch 9 : Replaced strncmp with memcmp, As token handling is
          from null terminated string to byte buffer.
Patch 10: Rebased with master.
Patch 11-12: OSX Build Failure Fixes.
Patch 13: Updated README related to secure-Iotivity stack.
Patch 14: Fixed issues identified in Patch 5.
Patch 15: Rebased with master to avoid merge conflicts.
Patch 16: Updated commit message

Change-Id: Icae698c3bf377862b561d6ebba1d784058d28adb
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1071
100 files changed:
build_common/SConscript [changed mode: 0644->0755]
extlibs/tinydtls/0001-Added-anonymous-ecdh-cipher-suite-into-tinydtls.patch [new file with mode: 0644]
extlibs/tinydtls/aes/rijndael.h
extlibs/tinydtls/crypto.c
extlibs/tinydtls/crypto.h
extlibs/tinydtls/dtls.c
extlibs/tinydtls/dtls.h
extlibs/tinydtls/ecc/Makefile.contiki [changed mode: 0644->0755]
extlibs/tinydtls/ecc/Makefile.ecc [changed mode: 0644->0755]
extlibs/tinydtls/ecc/test_helper.c [deleted file]
extlibs/tinydtls/ecc/test_helper.h [deleted file]
extlibs/tinydtls/ecc/testecc.c [deleted file]
extlibs/tinydtls/ecc/testfield.c [deleted file]
extlibs/tinydtls/global.h
extlibs/tinydtls/tests/dtls-client.c
extlibs/tinydtls/tests/dtls-server.c
extlibs/tinydtls/tinydtls.h
extlibs/tinydtls/uthash.h
extlibs/tinydtls/utlist.h
resource/SConscript
resource/csdk/SConscript
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/api/cainterface.h
resource/csdk/connectivity/inc/caadapternetdtls.h
resource/csdk/connectivity/inc/caipinterface.h
resource/csdk/connectivity/samples/linux/SConscript [changed mode: 0644->0755]
resource/csdk/connectivity/src/SConscript [changed mode: 0644->0755]
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/connectivity/src/adapter_util/caadapterutils.c
resource/csdk/connectivity/src/caconnectivitymanager.c
resource/csdk/connectivity/src/ip_adapter/caipadapter.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/security/README-building-and-running-secure-IoTivity-stack.txt [new file with mode: 0644]
resource/csdk/security/SConscript [new file with mode: 0644]
resource/csdk/security/include/base64.h [new file with mode: 0644]
resource/csdk/security/include/internal/aclresource.h [new file with mode: 0755]
resource/csdk/security/include/internal/credresource.h [new file with mode: 0644]
resource/csdk/security/include/internal/doxmresource.h [new file with mode: 0644]
resource/csdk/security/include/internal/policyengine.h [new file with mode: 0644]
resource/csdk/security/include/internal/psinterface.h [moved from resource/csdk/security/include/internal/ocsecurityinternal.h with 50% similarity]
resource/csdk/security/include/internal/pstatresource.h [new file with mode: 0644]
resource/csdk/security/include/internal/resourcemanager.h [new file with mode: 0644]
resource/csdk/security/include/internal/secureresourcemanager.h [new file with mode: 0644]
resource/csdk/security/include/internal/srmresourcestrings.h [new file with mode: 0644]
resource/csdk/security/include/ocsecurityconfig.h [deleted file]
resource/csdk/security/include/securevirtualresourcetypes.h [new file with mode: 0644]
resource/csdk/security/include/srmutility.h [moved from resource/csdk/security/include/ocsecurity.h with 50% similarity]
resource/csdk/security/provisioning/SConscript [new file with mode: 0644]
resource/csdk/security/provisioning/include/internal/credentialgenerator.h [new file with mode: 0644]
resource/csdk/security/provisioning/include/provisioningmanager.h [new file with mode: 0644]
resource/csdk/security/provisioning/sample/SConscript [new file with mode: 0755]
resource/csdk/security/provisioning/sample/oic_svr_db.json [new file with mode: 0755]
resource/csdk/security/provisioning/sample/provisioningclient.c [new file with mode: 0755]
resource/csdk/security/provisioning/src/credentialgenerator.c [new file with mode: 0644]
resource/csdk/security/provisioning/src/provisioningmanager.c [new file with mode: 0644]
resource/csdk/security/provisioning/unittest/SConscript [new file with mode: 0644]
resource/csdk/security/provisioning/unittest/provisioningmanager.cpp [new file with mode: 0644]
resource/csdk/security/src/aclresource.c [new file with mode: 0644]
resource/csdk/security/src/base64.c [new file with mode: 0644]
resource/csdk/security/src/credresource.c [new file with mode: 0755]
resource/csdk/security/src/doxmresource.c [new file with mode: 0755]
resource/csdk/security/src/ocsecurity.c [deleted file]
resource/csdk/security/src/policyengine.c [new file with mode: 0644]
resource/csdk/security/src/psinterface.c [new file with mode: 0644]
resource/csdk/security/src/pstatresource.c [new file with mode: 0644]
resource/csdk/security/src/resourcemanager.c [new file with mode: 0644]
resource/csdk/security/src/secureresourcemanager.c [new file with mode: 0644]
resource/csdk/security/src/srmresourcestrings.c [new file with mode: 0644]
resource/csdk/security/unittest/SConscript [new file with mode: 0644]
resource/csdk/security/unittest/aclresourcetest.cpp [new file with mode: 0644]
resource/csdk/security/unittest/base64tests.cpp [new file with mode: 0644]
resource/csdk/security/unittest/credentialresource.cpp [new file with mode: 0644]
resource/csdk/security/unittest/doxmresource.cpp [new file with mode: 0644]
resource/csdk/security/unittest/oic_svr_db.json [new file with mode: 0644]
resource/csdk/security/unittest/oic_unittest.json [new file with mode: 0644]
resource/csdk/security/unittest/oic_unittest_acl1.json [new file with mode: 0644]
resource/csdk/security/unittest/oic_unittest_default_acl.json [new file with mode: 0644]
resource/csdk/security/unittest/policyengine.cpp [new file with mode: 0644]
resource/csdk/security/unittest/pstatresource.cpp [new file with mode: 0644]
resource/csdk/security/unittest/securityresourcemanager.cpp [new file with mode: 0644]
resource/csdk/stack/include/ocstack.h
resource/csdk/stack/include/octypes.h
resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/common.cpp
resource/csdk/stack/samples/linux/secure/common.h
resource/csdk/stack/samples/linux/secure/gen_sec_bin.cpp [deleted file]
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json [new file with mode: 0644]
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json [new file with mode: 0644]
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/SConscript
resource/csdk/stack/test/stacktests.cpp
resource/unit_tests.scons
resource/unittests/SConscript