yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-11 11:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix style issues

Browse source
This commit is contained in:
Jarno Lamsa 2019-10-02 08:18:29 +03:00
parent 5aee8cab2a
commit 0ff7109b7c
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/platform_util.h
View file

@ -177,7 +177,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len );
* \param ptr Buffer to be set. * \param ptr Buffer to be set.
* \param value Value to be used when setting the buffer. * \param value Value to be used when setting the buffer.
* \param num The length of the buffer in bytes. * \param num The length of the buffer in bytes.
* *
*/ */
void mbedtls_platform_memset( void *ptr, int value, size_t num ); void mbedtls_platform_memset( void *ptr, int value, size_t num );

38
library/platform_util.c
View file

@ -82,15 +82,15 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
void mbedtls_platform_memset( void *ptr, int value, size_t num ) void mbedtls_platform_memset( void *ptr, int value, size_t num )
{ {
/* Randomize start offset. */ /* Randomize start offset. */
size_t startOffset = ( size_t ) mbedtls_platform_random_in_range( num ); size_t start_offset = (size_t) mbedtls_platform_random_in_range( num );
/* Randomize data */ /* Randomize data */
size_t data = ( size_t ) mbedtls_platform_random_in_range( 0xff ); size_t data = (size_t) mbedtls_platform_random_in_range( 0xff );
/* Perform a pair of memset operations from random locations with /* Perform a pair of memset operations from random locations with
* random data */ * random data */
memset( ( void * ) ( ( unsigned char * ) ptr + startOffset ), value, memset( (void *) ( (unsigned char *) ptr + start_offset ), value,
( num - startOffset ) ); ( num - start_offset ) );
memset( ( void * ) ptr, data, startOffset ); memset( (void *) ptr, data, start_offset );
/* Perform the original memset */ /* Perform the original memset */
memset( ptr, value, num ); memset( ptr, value, num );
@ -99,15 +99,15 @@ void mbedtls_platform_memset( void *ptr, int value, size_t num )
void mbedtls_platform_memcpy( void *dst, const void *src, size_t num ) void mbedtls_platform_memcpy( void *dst, const void *src, size_t num )
{ {
/* Randomize start offset. */ /* Randomize start offset. */
size_t startOffset = ( size_t ) mbedtls_platform_random_in_range( num ); size_t start_offset = (size_t) mbedtls_platform_random_in_range( num );
/* Randomize initial data to prevent leakage while copying */ /* Randomize initial data to prevent leakage while copying */
size_t data = ( size_t ) mbedtls_platform_random_in_range( 0xff ); size_t data = (size_t) mbedtls_platform_random_in_range( 0xff );
memset( ( void * ) dst, data, num ); memset( (void *) dst, data, num );
memcpy( ( void * ) ( ( unsigned char * ) dst + startOffset ), memcpy( (void *) ( (unsigned char *) dst + start_offset ),
( void * ) ( ( unsigned char * ) src + startOffset ), (void *) ( (unsigned char *) src + start_offset ),
( num - startOffset ) ); ( num - start_offset ) );
memcpy( ( void * ) dst, ( void * ) src, startOffset ); memcpy( (void *) dst, (void *) src, start_offset );
} }
int mbedtls_platform_memcmp( const void *buf1, const void *buf2, size_t num ) int mbedtls_platform_memcmp( const void *buf1, const void *buf2, size_t num )
@ -116,18 +116,18 @@ int mbedtls_platform_memcmp( const void *buf1, const void *buf2, size_t num )
size_t i = num; size_t i = num;
size_t startOffset = ( size_t ) mbedtls_platform_random_in_range( num ); size_t start_offset = (size_t) mbedtls_platform_random_in_range( num );
for( i = startOffset; i < num; i++ ) for( i = start_offset; i < num; i++ )
{ {
equal += ( ( ( unsigned char * ) buf1 )[i] == equal += ( ( (unsigned char *) buf1 )[i] ==
( ( unsigned char * ) buf2 )[i] ); ( (unsigned char *) buf2 )[i] );
} }
for( i = 0; i < startOffset; i++ ) for( i = 0; i < start_offset; i++ )
{ {
equal += ( ( ( unsigned char * ) buf1 )[i] == equal += ( ( (unsigned char *) buf1 )[i] ==
( ( unsigned char * ) buf2 )[i] ); ( (unsigned char *) buf2 )[i] );
} }
if ( equal == num ) if ( equal == num )