Improve readability of macro in selftest

This commit is contained in:
Manuel Pégourié-Gonnard 2020-01-07 10:17:35 +01:00
parent 0b9db441c8
commit 2d88549c6b

View File

@ -587,9 +587,7 @@ static const unsigned char sha512_test_sum[][64] =
0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B } 0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B }
}; };
#define SHA512_TEST_SUM_N \ #define ARRAY_LEN(a) ( sizeof( a ) / sizeof( a[0] ) )
( sizeof( sha512_test_sum ) / sizeof( sha512_test_sum[0] ) )
/* /*
* Checkup routine * Checkup routine
@ -612,7 +610,7 @@ int mbedtls_sha512_self_test( int verbose )
mbedtls_sha512_init( &ctx ); mbedtls_sha512_init( &ctx );
for( i = 0; i < (int) SHA512_TEST_SUM_N; i++ ) for( i = 0; i < (int) ARRAY_LEN(sha512_test_sum); i++ )
{ {
j = i % 3; j = i % 3;
#if !defined(MBEDTLS_SHA512_NO_SHA384) #if !defined(MBEDTLS_SHA512_NO_SHA384)
@ -675,6 +673,8 @@ exit:
return( ret ); return( ret );
} }
#undef ARRAY_LEN
#endif /* MBEDTLS_SELF_TEST */ #endif /* MBEDTLS_SELF_TEST */
#endif /* MBEDTLS_SHA512_C */ #endif /* MBEDTLS_SHA512_C */