Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Fri, 3 Mar 2017 20:59:10 +0000 (12:59 -0800)
committerKevin Kane <kkane@microsoft.com>
Fri, 3 Mar 2017 21:27:34 +0000 (13:27 -0800)
commit9215fe671a4147b71ac353e2724fd1fb45c419f6
tree21e3591b373504694e1f8d09d1bcd1c582f15175
parent93a9e32b7ef2270e4663edca558ac62cfbd578e5
parent364c07f950d544632fc75096a8d76b8e4bbf6061
Merge branch 'master' into iot-1785

Build breaks fixed.
occertutility.{c,h} moved back into security subtree.

Change-Id: I348dbe5d2133b57a49d4cdef05ce6e747af5eea0
Signed-off-by: Kevin Kane <kkane@microsoft.com>
19 files changed:
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/security/SConscript
resource/csdk/security/include/occertutility.h
resource/csdk/security/provisioning/include/internal/secureresourceprovider.h
resource/csdk/security/provisioning/include/ocprovisioningmanager.h
resource/csdk/security/provisioning/include/pmtypes.h
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/sample/certgenerator.cpp
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/csrresource.c
resource/csdk/security/src/occertutility.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/stack/octbstack_product_secured.def