mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 23:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code style fixes

Browse Source 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
This commit is contained in:
Minos Galanakis 2023-08-09 16:32:22 +01:00
parent b8d6b82df4
commit a277b210ff
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/entropy_poll.c
View File

@ -57,12 +57,12 @@
* These constants are guaranteed to be the same, though, so we suppress the * These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h. * warning when including intsafe.h.
*/ */
#pragma warning( push ) #pragma warning(push)
#pragma warning( disable : 4005 ) #pragma warning(disable : 4005)
#endif #endif
#include <intsafe.h> #include <intsafe.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600 #if defined(_MSC_VER) && _MSC_VER <= 1600
#pragma warning( pop ) #pragma warning(pop)
#endif #endif
int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len, int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
@ -77,14 +77,13 @@ int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
* 64-bit Windows platforms. Ensure len's value can be safely converted into * 64-bit Windows platforms. Ensure len's value can be safely converted into
* a ULONG. * a ULONG.
*/ */
if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) ) if (FAILED(SizeTToULong(len, &len_as_ulong))) {
{ return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
} }
if ( !BCRYPT_SUCCESS( BCryptGenRandom( NULL, output, len_as_ulong, BCRYPT_USE_SYSTEM_PREFERRED_RNG ) ) ) if (!BCRYPT_SUCCESS(BCryptGenRandom(NULL, output, len_as_ulong,
{ BCRYPT_USE_SYSTEM_PREFERRED_RNG))) {
return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED ); return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
} }
*olen = len; *olen = len;

19
library/x509_crt.c
View File

@ -67,12 +67,12 @@
* These constants are guaranteed to be the same, though, so we suppress the * These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h. * warning when including intsafe.h.
*/ */
#pragma warning( push ) #pragma warning(push )
#pragma warning( disable : 4005 ) #pragma warning(disable : 4005)
#endif #endif
#include <intsafe.h> #include <intsafe.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600 #if defined(_MSC_VER) && _MSC_VER <= 1600
#pragma warning( pop ) #pragma warning(pop)
#endif #endif
#else #else
#include <time.h> #include <time.h>
@ -1570,8 +1570,9 @@ int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path)
p = filename + len; p = filename + len;
filename[len++] = '*'; filename[len++] = '*';
if (FAILED (SizeTToInt(len, &length_as_int))) if (FAILED(SizeTToInt(len, &length_as_int))) {
return(MBEDTLS_ERR_X509_FILE_IO_ERROR); return MBEDTLS_ERR_X509_FILE_IO_ERROR;
}
/* /*
* Note this function uses the code page CP_ACP, and assumes the incoming * Note this function uses the code page CP_ACP, and assumes the incoming
@ -1600,15 +1601,15 @@ int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path)
continue; continue;
} }
if (FAILED(SizeTToInt(wcslen(file_data.cFileName), &length_as_int))) if (FAILED(SizeTToInt(wcslen(file_data.cFileName), &length_as_int))) {
return(MBEDTLS_ERR_X509_FILE_IO_ERROR); return MBEDTLS_ERR_X509_FILE_IO_ERROR;
}
w_ret = WideCharToMultiByte(CP_ACP, 0, file_data.cFileName, w_ret = WideCharToMultiByte(CP_ACP, 0, file_data.cFileName,
length_as_int, length_as_int,
p, (int) len - 1, p, (int) len - 1,
NULL, NULL); NULL, NULL);
if(w_ret == 0) if (w_ret == 0) {
{
ret = MBEDTLS_ERR_X509_FILE_IO_ERROR; ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
goto cleanup; goto cleanup;
} }

4
scripts/data_files/vs2013-app-template.vcxproj
View File

@ -162,8 +162,8 @@ INCLUDE_DIRECTORIES
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

8
scripts/data_files/vs2013-main-template.vcxproj
View File

@ -92,7 +92,7 @@ INCLUDE_DIRECTORIES
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -110,7 +110,7 @@ INCLUDE_DIRECTORIES
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -131,8 +131,8 @@ INCLUDE_DIRECTORIES
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>