Merge branch 'master' into iot-1785

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

diff --cc resource/csdk/connectivity/api/cacommon.h
index 867beee,340a8a0..867beee
mode 100755,100644..100644
--- 1/resource/csdk/connectivity/api/cacommon.h
--- 2/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h

diff --cc resource/csdk/security/SConscript
index b9bf0af,45372e4..8a8e1b3
--- 1/resource/csdk/security/SConscript
--- 2/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@@ -59,13 -59,7 +59,10 @@@ 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 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=['/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=['/wd4232', '/wd4200', '/wd4214', '/W4', '/WX'])
++      libocsrm_env.AppendUnique(CCFLAGS=['/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/securevirtualresourcetypes.h
Simple merge

diff --cc resource/csdk/security/src/secureresourcemanager.c
index 75b2d87,f725a6f..a4424a2
--- 1/resource/csdk/security/src/secureresourcemanager.c
--- 2/resource/csdk/security/src/secureresourcemanager.c
+++ b/resource/csdk/security/src/secureresourcemanager.c
@@@ -549,19 -576,10 +578,19 @@@ OicSecSvrType_t GetSvrTypeFromUri(cons
          }
      }
  
 +    svrLen = strlen(OIC_RSRC_CSR_URI);
 +    if (uriLen == svrLen)
 +    {
 +        if (0 == strncmp(uri, OIC_RSRC_CSR_URI, svrLen))
 +        {
 +            return OIC_R_CSR_TYPE;
 +        }
 +    }
 +
      svrLen = strlen(OIC_RSRC_DOXM_URI);
-     if(uriLen == svrLen)
+     if (uriLen == svrLen)
      {
-         if(0 == strncmp(uri, OIC_RSRC_DOXM_URI, svrLen))
+         if (0 == strncmp(uri, OIC_RSRC_DOXM_URI, svrLen))
          {
              return OIC_R_DOXM_TYPE;
          }
@@@ -594,19 -612,10 +623,19 @@@
          }
      }
  
 +    svrLen = strlen(OIC_RSRC_ROLES_URI);
 +    if (uriLen == svrLen)
 +    {
 +        if (0 == strncmp(uri, OIC_RSRC_ROLES_URI, svrLen))
 +        {
 +            return OIC_R_ROLES_TYPE;
 +        }
 +    }
 +
      svrLen = strlen(OIC_RSRC_SVC_URI);
-     if(uriLen == svrLen)
+     if (uriLen == svrLen)
      {
-         if(0 == strncmp(uri, OIC_RSRC_SVC_URI, svrLen))
+         if (0 == strncmp(uri, OIC_RSRC_SVC_URI, svrLen))
          {
              return OIC_R_SVC_TYPE;
          }