Merge branch 'master' into iot-1785

Conflicts:
  Restore OIC_JSON_SUBJECT_NAME definition in srmresourcestrings.{c,h}
  Warning settings in resource/csdk/security/SConscript

Change-Id: Iabb48389b8aaa1ffa480287979df264e30bfac89
Signed-off-by: Kevin Kane <kkane@microsoft.com>

diff --cc resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
Simple merge

diff --cc resource/csdk/connectivity/src/caconnectivitymanager.c
Simple merge

diff --cc resource/csdk/connectivity/test/ssladapter_test.cpp
Simple merge

diff --cc resource/csdk/security/SConscript
index 8d3d076,5eb8d2b..b9bf0af
--- 1/resource/csdk/security/SConscript
--- 2/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@@ -59,15 -59,10 +59,13 @@@ libocsrm_env.PrependUnique(CPPPATH = 
  
  if target_os in ['windows', 'msys_nt']:
        libocsrm_env.AppendUnique(LIBPATH = [os.path.join(libocsrm_env.get('BUILD_DIR'), 'resource', 'oc_logger')])
-     # Enable W4 but disable the following warnings:
-     #  - warning C4201: nonstandard extension used: nameless struct/union
-     #    - Disabled due to the widespread usage in internal IoTivity components as well as external libs.
+     # Enable W4 but disable the following warning:
      #  - warning C4232: nonstandard extension used: 'read': address of dllimport 'fread' is not static, identity not guaranteed
      #    - fread, frwrite, etc are provided by the platform and cannot be changed.
 -      libocsrm_env.AppendUnique(CCFLAGS=['/wd4232', '/W4', '/WX'])
 +    #  - warning C4200: nonstandard extension used: zero-sized array in struct/union
 +    #  - warning C4214: nonstandard extension used: bit field types other than int
 +    #    - warnings inherited from a header included from libcoap
-       libocsrm_env.AppendUnique(CCFLAGS=['/wd4201', '/wd4232', '/wd4200', '/wd4214', '/W4', '/WX'])
++      libocsrm_env.AppendUnique(CCFLAGS=['/wd4232', '/wd4200', '/wd4214', '/W4', '/WX'])
  
  if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1':
        SConscript('provisioning/SConscript', 'libocsrm_env')

diff --cc resource/csdk/security/include/internal/srmresourcestrings.h
index 44a3317,85ba6e8..2c3e71d
--- 1/resource/csdk/security/include/internal/srmresourcestrings.h
--- 2/resource/csdk/security/include/internal/srmresourcestrings.h
+++ b/resource/csdk/security/include/internal/srmresourcestrings.h
@@@ -105,8 -91,7 +105,6 @@@ extern const char * OIC_JSON_VER_NAME
  
  //reset profile
  extern const char * OIC_JSON_RESET_PF_NAME;
--
- extern const char * OIC_JSON_SUBJECT_NAME;
  extern const char * OIC_JSON_SUBJECTID_NAME;
  extern const char * OIC_JSON_RESOURCES_NAME;
  extern const char * OIC_JSON_AMSS_NAME;
@@@ -128,6 -113,6 +126,7 @@@ extern const char * OIC_JSON_OXM_TYPE_N
  extern const char * OIC_JSON_OXM_SEL_NAME;
  extern const char * OIC_JSON_DEVICE_ID_FORMAT_NAME;
  extern const char * OIC_JSON_CREDID_NAME;
++extern const char * OIC_JSON_SUBJECT_NAME;
  extern const char * OIC_JSON_ROLEIDS_NAME;
  extern const char * OIC_JSON_CREDTYPE_NAME;
  extern const char * OIC_JSON_PUBLICDATA_NAME;

diff --cc resource/csdk/security/include/securevirtualresourcetypes.h
Simple merge

diff --cc resource/csdk/security/provisioning/include/ocprovisioningmanager.h
Simple merge

diff --cc resource/csdk/security/provisioning/sample/provisioningclient.c
Simple merge

diff --cc resource/csdk/security/provisioning/sample/subownerclient.c
Simple merge

diff --cc resource/csdk/security/provisioning/src/ocprovisioningmanager.c
Simple merge

diff --cc resource/csdk/security/provisioning/src/ownershiptransfermanager.c
index f346cea,9c27e04..09ffbb6
mode 100755,100644..100644
--- 1/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
--- 2/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c

diff --cc resource/csdk/security/provisioning/src/secureresourceprovider.c
Simple merge

diff --cc resource/csdk/security/src/credresource.c
Simple merge

diff --cc resource/csdk/security/src/doxmresource.c
Simple merge

diff --cc resource/csdk/security/src/dpairingresource.c
Simple merge

diff --cc resource/csdk/security/src/policyengine.c
Simple merge

diff --cc resource/csdk/security/src/resourcemanager.c
index a281931,323a0bf..a6d09b7
--- 1/resource/csdk/security/src/resourcemanager.c
--- 2/resource/csdk/security/src/resourcemanager.c
+++ b/resource/csdk/security/src/resourcemanager.c
@@@ -146,10 -131,7 +141,9 @@@ OCStackResult DestroySecureResources( 
      DeInitPstatResource();
  #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
      DeInitCRLResource();
 +    DeInitCSRResource();
 +    DeInitRolesResource();
  #endif // __WITH_DTLS__ || __WITH_TLS__
-     DeInitSVCResource();
      DeInitAmaclResource();
  //#ifdef DIRECT_PAIRING
      DeInitPconfResource();

diff --cc resource/csdk/security/src/srmresourcestrings.c
index 5926a01,3d4b913..b4b10e6
--- 1/resource/csdk/security/src/srmresourcestrings.c
--- 2/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@@ -128,6 -113,6 +127,7 @@@ const char * OIC_JSON_TM_NAME = "tm"
  const char * OIC_JSON_OM_NAME = "om";
  const char * OIC_JSON_SM_NAME = "sm";
  const char * OIC_JSON_CREDID_NAME = "credid";
++const char * OIC_JSON_SUBJECT_NAME = "subject";
  const char * OIC_JSON_SUBJECTID_NAME = "subjectuuid";
  const char * OIC_JSON_ROLEIDS_NAME = "roleid";
  const char * OIC_JSON_CREDTYPE_NAME = "credtype";

diff --cc resource/csdk/security/tool/json2cbor.c
Simple merge

diff --cc resource/csdk/stack/octbstack_product_secured.def
index a62173d,aa4f1a7..2a43031
--- 1/resource/csdk/stack/octbstack_product_secured.def
--- 2/resource/csdk/stack/octbstack_product_secured.def
+++ b/resource/csdk/stack/octbstack_product_secured.def
@@@ -25,23 -23,14 +25,24 @@@ OCDiscoverOwnedDevice
  OCDiscoverSingleDevice
  OCDiscoverUnownedDevices
  OCDoOwnershipTransfer
 +OCGenerateCACertificate
 +OCGenerateIdentityCertificate
 +OCGenerateKeyPair
 +OCGenerateRandomSerialNumber
 +OCGenerateRoleCertificate
  OCGetACLResource
  OCGetCredResource
 +OCGetCSRResource
  OCGetDevInfoFromNetwork
  OCGetLinkedStatus
 +OCGetPublicKeyFromCSR
 +OCGetRolesResource
 +OCGetUuidFromCSR
  OCInitPM
+ OCPDMCleanupForTimeout
  OCProvisionACL
  OCSaveACL
 +OCProvisionCertificate
  OCProvisionCredentials
  OCProvisionDirectPairing
  OCProvisionPairwiseDevices