From ec0193d019798e9811e55843f9846a8475c394ae Mon Sep 17 00:00:00 2001 From: Werner Lewis Date: Mon, 13 Jun 2022 12:28:25 +0100 Subject: [PATCH] Update test to cover move-decrypt sequence Signed-off-by: Werner Lewis --- tests/suites/test_suite_aes.function | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function index 0c321cdb7..5ab265a2f 100644 --- a/tests/suites/test_suite_aes.function +++ b/tests/suites/test_suite_aes.function @@ -464,7 +464,7 @@ void aes_misc_params( ) void aes_ecb_copy_context( data_t * key_str, data_t * src_str ) { unsigned char output1[16], output2[16], plain[16]; - mbedtls_aes_context ctx1, ctx2; + mbedtls_aes_context ctx1, ctx2, ctx3; // Set key and encrypt with original context mbedtls_aes_init( &ctx1 ); @@ -474,18 +474,19 @@ void aes_ecb_copy_context( data_t * key_str, data_t * src_str ) src_str->x, output1 ) == 0 ); ctx2 = ctx1; + TEST_ASSERT( mbedtls_aes_setkey_dec( &ctx1, key_str->x, + key_str->len * 8 ) == 0 ); + ctx3 = ctx1; memset( &ctx1, 0, sizeof( ctx1 ) ); - // Encrypt with copied context and decrypt + // Encrypt and decrypt with copied context TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx2, MBEDTLS_AES_ENCRYPT, src_str->x, output2 ) == 0 ); - TEST_ASSERT( mbedtls_aes_setkey_dec( &ctx2, key_str->x, - key_str->len * 8) == 0 ); - TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx2, MBEDTLS_AES_DECRYPT, + TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx3, MBEDTLS_AES_DECRYPT, output1, plain ) == 0 ); TEST_ASSERT( mbedtls_test_hexcmp( output1, output2, 16, 16 ) == 0 ); - TEST_ASSERT( mbedtls_test_hexcmp( src_str->x, plain, src_str->len, 16) == 0 ); + TEST_ASSERT( mbedtls_test_hexcmp( src_str->x, plain, src_str->len, 16 ) == 0 ); } /* END_CASE */