projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4de990f f957064)
Merge branch 'security-CKM' into 'master'
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)
* 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>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;