Fix tests and programs to use md_get_xxx()
diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index b002934..a1406b6 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -126,7 +126,7 @@
while( *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++;
}
diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c
index 888f0f9..f2a947e 100644
--- a/programs/hash/generic_sum.c
+++ b/programs/hash/generic_sum.c
@@ -69,7 +69,7 @@
if( generic_wrapper( md_info, filename, sum ) != 0 )
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( " %s\n", filename );
@@ -104,15 +104,15 @@
{
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;
}
- 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;
}
@@ -121,7 +121,7 @@
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++;
continue;
@@ -129,12 +129,12 @@
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] );
/* Use constant-time buffer comparison */
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];
if( diff != 0 )
@@ -183,7 +183,7 @@
while( *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++;
}
diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function
index 98d834a..864fade 100644
--- a/tests/suites/test_suite_ecdsa.function
+++ b/tests/suites/test_suite_ecdsa.function
@@ -117,7 +117,7 @@
md_info = md_info_from_type( md_alg );
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 );
TEST_ASSERT( ecdsa_sign_det( &grp, &r, &s, &d, hash, hlen, md_alg ) == 0 );