yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 16:25:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use zeroize function from new platform_util

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2018-05-22 16:05:33 +02:00
parent a3712beb9b
commit 7124fb63be
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/aria.c
View File

@ -48,16 +48,13 @@
#if !defined(MBEDTLS_ARIA_ALT) #if !defined(MBEDTLS_ARIA_ALT)
#include "mbedtls/platform_util.h"
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus) !defined(inline) && !defined(__cplusplus)
#define inline __inline #define inline __inline
#endif #endif
/* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0;
}
/* /*
* 32-bit integer manipulation macros (little endian) * 32-bit integer manipulation macros (little endian)
*/ */
@ -494,7 +491,7 @@ int mbedtls_aria_setkey_enc( mbedtls_aria_context *ctx,
aria_rot128( ctx->rk[16], w[0], w[1], 19 ); aria_rot128( ctx->rk[16], w[0], w[1], 19 );
/* w holds enough info to reconstruct the round keys */ /* w holds enough info to reconstruct the round keys */
mbedtls_zeroize( w, sizeof( w ) ); mbedtls_platform_zeroize( w, sizeof( w ) );
return( 0 ); return( 0 );
} }
@ -598,7 +595,7 @@ void mbedtls_aria_free( mbedtls_aria_context *ctx )
if( ctx == NULL ) if( ctx == NULL )
return; return;
mbedtls_zeroize( ctx, sizeof( mbedtls_aria_context ) ); mbedtls_platform_zeroize( ctx, sizeof( mbedtls_aria_context ) );
} }
#if defined(MBEDTLS_CIPHER_MODE_CBC) #if defined(MBEDTLS_CIPHER_MODE_CBC)