Commit 85bc1fbd authored by Kishen Maloor's avatar Kishen Maloor

Merge branch 'gaborone+' into hollywood

Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parents e714e40e e3598d60
......@@ -634,7 +634,7 @@ static void
oc_ri_audit_log(oc_method_t method, oc_resource_t *resource,
oc_endpoint_t *endpoint)
{
static const size_t LINE_WIDTH = 80;
#define LINE_WIDTH 80
char aux_arr[6][LINE_WIDTH];
memset(aux_arr, 0, sizeof(aux_arr));
char *aux[] = { aux_arr[0], aux_arr[1], aux_arr[2],
......
......@@ -43,7 +43,7 @@ cd %~dp0..\..\deps\mbedtls || goto error
@rem -s : work silently
@rem -N : do not reverse the patch if already applied
@rem -p1 : remove first path component from paths in the patches
for /r ..\..\patches %%F IN (*.patch) DO (
for /r ..\..\patches %%F IN (05_mbedtls_ocf-microsoft.patch 06_mbedtls_constrained.patch 08_mbedtls_C99.patch 09-ocf-samsung-psk.patch 10-ocf-samsung-anon.patch) DO (
"%PATCH_CMD%" -r - -s -N -p1 < %%F || goto error
)
@rem VS project can check existence of the file whether to invoke
......
......@@ -262,6 +262,8 @@
<ClInclude Include="..\..\..\messaging\coap\separate.h" />
<ClInclude Include="..\..\..\messaging\coap\transactions.h" />
<ClInclude Include="..\..\..\security\oc_acl_internal.h" />
<ClInclude Include="..\..\..\security\oc_ael.h" />
<ClInclude Include="..\..\..\security\oc_audit.h" />
<ClInclude Include="..\..\..\security\oc_certs.h" />
<ClInclude Include="..\..\..\security\oc_cred_internal.h" />
<ClInclude Include="..\..\..\security\oc_csr.h" />
......@@ -416,6 +418,8 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\security\oc_ael.c" />
<ClCompile Include="..\..\..\security\oc_audit.c" />
<ClCompile Include="..\..\..\security\oc_certs.c" />
<ClCompile Include="..\..\..\security\oc_cred.c" />
<ClCompile Include="..\..\..\security\oc_csr.c" />
......
......@@ -457,6 +457,12 @@
<ClCompile Include="..\..\..\api\oc_swupdate.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\security\oc_ael.c">
<Filter>Security</Filter>
</ClCompile>
<ClCompile Include="..\..\..\security\oc_audit.c">
<Filter>Security</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\deps\tinycbor\src\cbor.h">
......@@ -729,6 +735,12 @@
<ClInclude Include="..\..\..\include\oc_enums.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\security\oc_ael.h">
<Filter>Security</Filter>
</ClInclude>
<ClInclude Include="..\..\..\security\oc_audit.h">
<Filter>Security</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="mbedTLS">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment