mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-01 04:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix formatting and detail of comments in PR #730

Browse Source 
Signed-off-by: Simon Butcher <simon.butcher@arm.com>
This commit is contained in:
Simon Butcher 2018-03-14 17:02:16 +00:00 committed by Minos Galanakis
parent 1c0c5d2a62
commit def90f4966
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/entropy_poll.c
View File

@ -52,9 +52,10 @@
#if _WIN32_WINNT >= 0x0501 /* _WIN32_WINNT_WINXP */ #if _WIN32_WINNT >= 0x0501 /* _WIN32_WINNT_WINXP */
#include <bcrypt.h> #include <bcrypt.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600 #if defined(_MSC_VER) && _MSC_VER <= 1600
/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they /* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and
* redefine a number of <TYPE>_MAX constants. These constants are guaranteed to be the same, though, so * <intsafe.h> are included, as they redefine a number of <TYPE>_MAX constants.
* we suppress the warning when including intsafe.h. * These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h.
*/ */
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4005 ) #pragma warning( disable : 4005 )
@ -72,8 +73,9 @@ int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
*olen = 0; *olen = 0;
/* /*
* BCryptGenRandom takes ULONG for size, which is smaller than size_t on 64-bit platforms. * BCryptGenRandom takes ULONG for size, which is smaller than size_t on
* Ensure len's value can be safely converted into a ULONG. * 64-bit Windows platforms. Ensure len's value can be safely converted into
* a ULONG.
*/ */
if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) ) if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) )
{ {

7
library/x509_crt.c
View File

@ -62,9 +62,10 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600 #if defined(_MSC_VER) && _MSC_VER <= 1600
/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they /* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and
* redefine a number of <TYPE>_MAX constants. These constants are guaranteed to be the same, though, so * <intsafe.h> are included, as they redefine a number of <TYPE>_MAX constants.
* we suppress the warning when including intsafe.h. * These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h.
*/ */
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4005 ) #pragma warning( disable : 4005 )