Commit b981b163 authored by Simon Butcher's avatar Simon Butcher

Minor fixes to formatting and compilation conditions

parent 69283e51
...@@ -93,14 +93,14 @@ int main( void ) ...@@ -93,14 +93,14 @@ int main( void )
#define OPTIONS \ #define OPTIONS \
"md4, md5, ripemd160, sha1, sha256, sha512,\n" \ "md4, md5, ripemd160, sha1, sha256, sha512,\n" \
"arc4, des3, des, camellia, blowfish,\n" \ "arc4, des3, des, camellia, blowfish,\n" \
"aes_cbc, aes_gcm, aes_ccm, aes_cmac, des3_cmac,\n" \ "aes_cbc, aes_gcm, aes_ccm, aes_cmac, des3_cmac,\n" \
"havege, ctr_drbg, hmac_drbg\n" \ "havege, ctr_drbg, hmac_drbg\n" \
"rsa, dhm, ecdsa, ecdh.\n" "rsa, dhm, ecdsa, ecdh.\n"
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
#define PRINT_ERROR \ #define PRINT_ERROR \
mbedtls_strerror( ret, ( char * )tmp, sizeof( tmp ) ); \ mbedtls_strerror( ret, ( char * )tmp, sizeof( tmp ) ); \
mbedtls_printf( "FAILED: %s\n", tmp ); mbedtls_printf( "FAILED: %s\n", tmp );
#else #else
#define PRINT_ERROR \ #define PRINT_ERROR \
...@@ -401,8 +401,8 @@ int main( int argc, char *argv[] ) ...@@ -401,8 +401,8 @@ int main( int argc, char *argv[] )
cipher_info = mbedtls_cipher_info_from_type( MBEDTLS_CIPHER_DES_EDE3_ECB ); cipher_info = mbedtls_cipher_info_from_type( MBEDTLS_CIPHER_DES_EDE3_ECB );
TIME_AND_TSC( "3DES-CMAC", TIME_AND_TSC( "3DES-CMAC",
mbedtls_cipher_cmac( cipher_info, tmp, 192, buf, mbedtls_cipher_cmac( cipher_info, tmp, 192, buf,
BUFSIZE, output ) ); BUFSIZE, output ) );
} }
#endif /* MBEDTLS_CMAC_C */ #endif /* MBEDTLS_CMAC_C */
#endif /* MBEDTLS_DES_C */ #endif /* MBEDTLS_DES_C */
...@@ -501,7 +501,8 @@ int main( int argc, char *argv[] ) ...@@ -501,7 +501,8 @@ int main( int argc, char *argv[] )
memset( buf, 0, sizeof( buf ) ); memset( buf, 0, sizeof( buf ) );
memset( tmp, 0, sizeof( tmp ) ); memset( tmp, 0, sizeof( tmp ) );
TIME_AND_TSC( "AES-CMAC-PRF-128", TIME_AND_TSC( "AES-CMAC-PRF-128",
mbedtls_aes_cmac_prf_128( tmp, 16, buf, BUFSIZE, output ) ); mbedtls_aes_cmac_prf_128( tmp, 16, buf, BUFSIZE,
output ) );
} }
#endif /* MBEDTLS_CMAC_C */ #endif /* MBEDTLS_CMAC_C */
#endif /* MBEDTLS_AES_C */ #endif /* MBEDTLS_AES_C */
......
...@@ -278,7 +278,7 @@ int main( int argc, char *argv[] ) ...@@ -278,7 +278,7 @@ int main( int argc, char *argv[] )
suites_tested++; suites_tested++;
#endif #endif
#if defined(MBEDTLS_CMAC_C) && ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) ) #if defined(MBEDTLS_CMAC_C)
if( ( mbedtls_cmac_self_test( v ) ) != 0 ) if( ( mbedtls_cmac_self_test( v ) ) != 0 )
{ {
suites_failed++; suites_failed++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment