More cleanup of CMAC self tests

This commit is contained in:
Brian Murray 2016-05-19 16:36:56 -07:00 committed by Simon Butcher
parent b439d4556d
commit 9044b0295c

View file

@ -743,66 +743,83 @@ int mbedtls_cmac_self_test( int verbose )
int ret; int ret;
#ifdef MBEDTLS_AES_C #ifdef MBEDTLS_AES_C
test_cmac_with_cipher( verbose, if( ( ret = test_cmac_with_cipher( verbose,
"AES 128", "AES 128",
aes_128_key, aes_128_key,
128, 128,
test_message, test_message,
aes_message_lengths, aes_message_lengths,
aes_128_subkeys, aes_128_subkeys,
aes_128_expected_result, aes_128_expected_result,
MBEDTLS_CIPHER_ID_AES, MBEDTLS_CIPHER_ID_AES,
AES_BLOCK_SIZE ); AES_BLOCK_SIZE ) !=0 ) )
{
return( ret );
}
test_cmac_with_cipher( verbose, if( ( ret = test_cmac_with_cipher( verbose,
"AES 192", "AES 192",
aes_192_key, aes_192_key,
192, 192,
test_message, test_message,
aes_message_lengths, aes_message_lengths,
aes_192_subkeys, aes_192_subkeys,
aes_192_expected_result, aes_192_expected_result,
MBEDTLS_CIPHER_ID_AES, MBEDTLS_CIPHER_ID_AES,
AES_BLOCK_SIZE ); AES_BLOCK_SIZE ) !=0 ) )
{
return( ret );
}
test_cmac_with_cipher ( verbose, if( ( ret = test_cmac_with_cipher ( verbose,
"AES 256", "AES 256",
aes_256_key, aes_256_key,
256, 256,
test_message, test_message,
aes_message_lengths, aes_message_lengths,
aes_256_subkeys, aes_256_subkeys,
aes_256_expected_result, aes_256_expected_result,
MBEDTLS_CIPHER_ID_AES, MBEDTLS_CIPHER_ID_AES,
AES_BLOCK_SIZE ); AES_BLOCK_SIZE ) !=0 ) )
{
return( ret );
}
#endif /* MBEDTLS_AES_C */ #endif /* MBEDTLS_AES_C */
#ifdef MBEDTLS_DES_C #ifdef MBEDTLS_DES_C
test_cmac_with_cipher( verbose, if( ( ret = test_cmac_with_cipher( verbose,
"3DES 2 key", "3DES 2 key",
des3_2key_key, des3_2key_key,
192, 192,
test_message, test_message,
des3_message_lengths, des3_message_lengths,
des3_2key_subkeys, des3_2key_subkeys,
T_3des_2key, T_3des_2key,
MBEDTLS_CIPHER_ID_3DES, MBEDTLS_CIPHER_ID_3DES,
DES3_BLOCK_SIZE ); DES3_BLOCK_SIZE ) !=0 ) )
{
return( ret );
}
test_cmac_with_cipher( verbose, if( ( ret = test_cmac_with_cipher( verbose,
"3DES 3 key", "3DES 3 key",
des3_3key_key, des3_3key_key,
192, 192,
test_message, test_message,
des3_message_lengths, des3_message_lengths,
des3_3key_subkeys, des3_3key_subkeys,
T_3des_3key, T_3des_3key,
MBEDTLS_CIPHER_ID_3DES, MBEDTLS_CIPHER_ID_3DES,
DES3_BLOCK_SIZE ); DES3_BLOCK_SIZE ) !=0 ) )
{
return( ret );
}
#endif /* MBEDTLS_DES_C */ #endif /* MBEDTLS_DES_C */
#ifdef MBEDTLS_AES_C #ifdef MBEDTLS_AES_C
test_aes128_cmac_prf( verbose ); if( ( ret = test_aes128_cmac_prf( verbose ) != 0 ) )
return( ret );
#endif /* MBEDTLS_AES_C */ #endif /* MBEDTLS_AES_C */
if( verbose != 0 ) if( verbose != 0 )