AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests and programs to use md_get_xxx()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-24 13:48:05 +01:00
parent ca878dbaa5
commit a115def330
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/aes/crypt_and_hash.c
View File

@ -126,7 +126,7 @@ int main( int argc, char *argv[] )
while( *list ) while( *list )
{ {
md_info = md_info_from_type( *list ); md_info = md_info_from_type( *list );
polarssl_printf( " %s\n", md_info->name ); polarssl_printf( " %s\n", md_get_name( md_info ) );
list++; list++;
} }

18
programs/hash/generic_sum.c
View File

@ -69,7 +69,7 @@ static int generic_print( const md_info_t *md_info, char *filename )
if( generic_wrapper( md_info, filename, sum ) != 0 ) if( generic_wrapper( md_info, filename, sum ) != 0 )
return( 1 ); return( 1 );
for( i = 0; i < md_info->size; i++ ) for( i = 0; i < md_get_size( md_info ); i++ )
polarssl_printf( "%02x", sum[i] ); polarssl_printf( "%02x", sum[i] );
polarssl_printf( " %s\n", filename ); polarssl_printf( " %s\n", filename );
@ -104,15 +104,15 @@ static int generic_check( const md_info_t *md_info, char *filename )
{ {
n = strlen( line ); n = strlen( line );
if( n < (size_t) 2 * md_info->size + 4 ) if( n < (size_t) 2 * md_get_size( md_info ) + 4 )
{ {
polarssl_printf("No '%s' hash found on line.\n", md_info->name); polarssl_printf("No '%s' hash found on line.\n", md_get_name( md_info ));
continue; continue;
} }
if( line[2 * md_info->size] != ' ' || line[2 * md_info->size + 1] != ' ' ) if( line[2 * md_get_size( md_info )] != ' ' || line[2 * md_get_size( md_info ) + 1] != ' ' )
{ {
polarssl_printf("No '%s' hash found on line.\n", md_info->name); polarssl_printf("No '%s' hash found on line.\n", md_get_name( md_info ));
continue; continue;
} }
@ -121,7 +121,7 @@ static int generic_check( const md_info_t *md_info, char *filename )
nb_tot1++; nb_tot1++;
if( generic_wrapper( md_info, line + 2 + 2 * md_info->size, sum ) != 0 ) if( generic_wrapper( md_info, line + 2 + 2 * md_get_size( md_info ), sum ) != 0 )
{ {
nb_err1++; nb_err1++;
continue; continue;
@ -129,12 +129,12 @@ static int generic_check( const md_info_t *md_info, char *filename )
nb_tot2++; nb_tot2++;
for( i = 0; i < md_info->size; i++ ) for( i = 0; i < md_get_size( md_info ); i++ )
sprintf( buf + i * 2, "%02x", sum[i] ); sprintf( buf + i * 2, "%02x", sum[i] );
/* Use constant-time buffer comparison */ /* Use constant-time buffer comparison */
diff = 0; diff = 0;
for( i = 0; i < 2 * md_info->size; i++ ) for( i = 0; i < 2 * md_get_size( md_info ); i++ )
diff |= line[i] ^ buf[i]; diff |= line[i] ^ buf[i];
if( diff != 0 ) if( diff != 0 )
@ -183,7 +183,7 @@ int main( int argc, char *argv[] )
while( *list ) while( *list )
{ {
md_info = md_info_from_type( *list ); md_info = md_info_from_type( *list );
polarssl_printf( " %s\n", md_info->name ); polarssl_printf( " %s\n", md_get_name( md_info ) );
list++; list++;
} }

2
tests/suites/test_suite_ecdsa.function
View File

@ -117,7 +117,7 @@ void ecdsa_det_test_vectors( int id, char *d_str, int md_alg,
md_info = md_info_from_type( md_alg ); md_info = md_info_from_type( md_alg );
TEST_ASSERT( md_info != NULL ); TEST_ASSERT( md_info != NULL );
hlen = md_info->size; hlen = md_get_size( md_info );
md( md_info, (const unsigned char *) msg, strlen( msg ), hash ); md( md_info, (const unsigned char *) msg, strlen( msg ), hash );
TEST_ASSERT( ecdsa_sign_det( &grp, &r, &s, &d, hash, hlen, md_alg ) == 0 ); TEST_ASSERT( ecdsa_sign_det( &grp, &r, &s, &d, hash, hlen, md_alg ) == 0 );