Merge branch 'security-CKM' into 'master' 31/3231/1
authorSachin Agrawal <sachin.agrawal@intel.com>
Mon, 28 Sep 2015 16:38:19 +0000 (09:38 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Mon, 28 Sep 2015 16:38:19 +0000 (09:38 -0700)
commit78d5cb6296c178dea7e6e9c10abf3ccd72002c1d
treea5ede750428699258fbed6e300a906d803e1c656
parent4de990f9ff7947c325d56338dbf2ed4f6e6d57ae
parentf95706411ee07ad237f2aed548630159a4045323
Merge branch 'security-CKM' into 'master'

* security-CKM:
  Removed automatic switching to X.509 in CA
  implement unit tests for CK manager
  Add sample of PKIX provisioning

Conflicts:
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c

Change-Id: If1e8367e3729b152602d1585bc433f083354c5e1
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>