review.tizen.org Git - contrib/iotivity.git/commit

projects / contrib / iotivity.git / commit

author	Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
	Sat, 19 Sep 2015 14:01:27 +0000 (17:01 +0300)
committer	Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
	Sat, 19 Sep 2015 14:06:38 +0000 (17:06 +0300)
commit	ed0bcb17d4860408dfb86f544da9b66ec925b2ca
tree	cf7b790b57d1f6ac887d6f9d2334dd277ba2ea65	tree \| snapshot
parent	e66ec533de0d7b24565b20cc335d0ffe35321679	commit \| diff
parent	6c759a29639dece204d1b9f8fef296140e934899	commit \| diff

Merge branch 'security-CKM' into 'master'

* security-CKM:
  Add PKIX build
  implement certificate key manager
  CA retrieve PKIX resource from SRM using callbacks
  Add PKIX provisioning
  Add PKIX resources
  Add PKIX API for CA
  add support of X.509 into tinyDTLS external library
  Add certificate verification
  Add ASN.1 for PKIX

Conflicts:
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/include/ocprovisioningmanager.h
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c

Change-Id: I7ec588eeec8e04e0bf9de84ebf520023a3f97dfe
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>

26 files changed:

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
extlibs/tinydtls/dtls.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/api/cainterface.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/samples/linux/sample_main.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/caconnectivitymanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/internal/srmresourcestrings.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/securevirtualresourcetypes.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/include/ocprovisioningmanager.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/sample/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/credentialgenerator.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/ocprovisioningmanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/secureresourceprovider.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/unittest/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/credresource.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/crlresource.c	\|	diff2 \|	blob \| history
resource/csdk/security/src/doxmresource.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/psinterface.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/resourcemanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/secureresourcemanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/srmresourcestrings.c	diff1 \|	diff2 \|	blob \| history
resource/provisioning/examples/SConscript	diff1 \|	\|	blob \| history
resource/provisioning/unittests/SConscript	diff1 \|	\|	blob \| history

Domain: SCM / Uncategorized;

RSS Atom

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
extlibs/tinydtls/dtls.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/api/cainterface.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/samples/linux/sample_main.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/caconnectivitymanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/internal/srmresourcestrings.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/include/securevirtualresourcetypes.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/include/ocprovisioningmanager.h	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/sample/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/credentialgenerator.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/ocprovisioningmanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/src/secureresourceprovider.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/provisioning/unittest/SConscript	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/credresource.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/crlresource.c	\|	diff2 \|	blob \| history
resource/csdk/security/src/doxmresource.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/psinterface.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/resourcemanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/secureresourcemanager.c	diff1 \|	diff2 \|	blob \| history
resource/csdk/security/src/srmresourcestrings.c	diff1 \|	diff2 \|	blob \| history
resource/provisioning/examples/SConscript	diff1 \|	\|	blob \| history
resource/provisioning/unittests/SConscript	diff1 \|	\|	blob \| history