yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace #if(n)def by #if (!)defined

Browse source
This commit is contained in:
Hanno Becker 2017-06-19 16:31:54 +01:00
parent 371f31c281
commit ad049a973c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/aes.c
View file

@ -201,7 +201,7 @@ static const unsigned char FSb[256] =
static const uint32_t FT0[256] = { FT }; static const uint32_t FT0[256] = { FT };
#undef V #undef V
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
#define V(a,b,c,d) 0x##b##c##d##a #define V(a,b,c,d) 0x##b##c##d##a
static const uint32_t FT1[256] = { FT }; static const uint32_t FT1[256] = { FT };
@ -332,7 +332,7 @@ static const unsigned char RSb[256] =
static const uint32_t RT0[256] = { RT }; static const uint32_t RT0[256] = { RT };
#undef V #undef V
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
#define V(a,b,c,d) 0x##b##c##d##a #define V(a,b,c,d) 0x##b##c##d##a
static const uint32_t RT1[256] = { RT }; static const uint32_t RT1[256] = { RT };
@ -367,7 +367,7 @@ static const uint32_t RCON[10] =
*/ */
static unsigned char FSb[256]; static unsigned char FSb[256];
static uint32_t FT0[256]; static uint32_t FT0[256];
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
static uint32_t FT1[256]; static uint32_t FT1[256];
static uint32_t FT2[256]; static uint32_t FT2[256];
static uint32_t FT3[256]; static uint32_t FT3[256];
@ -378,7 +378,7 @@ static uint32_t FT3[256];
*/ */
static unsigned char RSb[256]; static unsigned char RSb[256];
static uint32_t RT0[256]; static uint32_t RT0[256];
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
static uint32_t RT1[256]; static uint32_t RT1[256];
static uint32_t RT2[256]; static uint32_t RT2[256];
static uint32_t RT3[256]; static uint32_t RT3[256];
@ -457,7 +457,7 @@ static void aes_gen_tables( void )
( (uint32_t) x << 16 ) ^ ( (uint32_t) x << 16 ) ^
( (uint32_t) z << 24 ); ( (uint32_t) z << 24 );
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
FT1[i] = ROTL8( FT0[i] ); FT1[i] = ROTL8( FT0[i] );
FT2[i] = ROTL8( FT1[i] ); FT2[i] = ROTL8( FT1[i] );
FT3[i] = ROTL8( FT2[i] ); FT3[i] = ROTL8( FT2[i] );
@ -470,7 +470,7 @@ static void aes_gen_tables( void )
( (uint32_t) MUL( 0x0D, x ) << 16 ) ^ ( (uint32_t) MUL( 0x0D, x ) << 16 ) ^
( (uint32_t) MUL( 0x0B, x ) << 24 ); ( (uint32_t) MUL( 0x0B, x ) << 24 );
#ifndef MBEDTLS_AES_FEWER_TABLES #if !defined(MBEDTLS_AES_FEWER_TABLES)
RT1[i] = ROTL8( RT0[i] ); RT1[i] = ROTL8( RT0[i] );
RT2[i] = ROTL8( RT1[i] ); RT2[i] = ROTL8( RT1[i] );
RT3[i] = ROTL8( RT2[i] ); RT3[i] = ROTL8( RT2[i] );
@ -482,7 +482,7 @@ static void aes_gen_tables( void )
#endif /* MBEDTLS_AES_ROM_TABLES */ #endif /* MBEDTLS_AES_ROM_TABLES */
#ifdef MBEDTLS_AES_FEWER_TABLES #if defined(MBEDTLS_AES_FEWER_TABLES)
#define ROTL8(x) ( (uint32_t)( ( x ) << 8 ) + (uint32_t)( ( x ) >> 24 ) ) #define ROTL8(x) ( (uint32_t)( ( x ) << 8 ) + (uint32_t)( ( x ) >> 24 ) )
#define ROTL16(x) ( (uint32_t)( ( x ) << 16 ) + (uint32_t)( ( x ) >> 16 ) ) #define ROTL16(x) ( (uint32_t)( ( x ) << 16 ) + (uint32_t)( ( x ) >> 16 ) )