Merge remote-tracking branch 'public/pr/1690' into development

This commit is contained in:
Simon Butcher 2018-06-05 18:24:10 +01:00
commit 33dd3236de

View file

@ -42,9 +42,8 @@ void aria_encrypt_ecb( char *hex_key_string, char *hex_src_string,
{ {
for( i = 0; i < data_len; i += MBEDTLS_ARIA_BLOCKSIZE ) for( i = 0; i < data_len; i += MBEDTLS_ARIA_BLOCKSIZE )
{ {
TEST_ASSERT( mbedtls_aria_crypt_ecb( &ctx, MBEDTLS_ARIA_ENCRYPT, TEST_ASSERT( mbedtls_aria_crypt_ecb( &ctx, src_str + i, output + i )
src_str + i, output + i ) == 0 );
== 0 );
} }
hexify( dst_str, output, data_len ); hexify( dst_str, output, data_len );
@ -82,8 +81,7 @@ void aria_decrypt_ecb( char *hex_key_string, char *hex_src_string,
{ {
for( i = 0; i < data_len; i += MBEDTLS_ARIA_BLOCKSIZE ) for( i = 0; i < data_len; i += MBEDTLS_ARIA_BLOCKSIZE )
{ {
TEST_ASSERT( mbedtls_aria_crypt_ecb( &ctx, MBEDTLS_ARIA_DECRYPT, TEST_ASSERT( mbedtls_aria_crypt_ecb( &ctx, src_str + i, output + i )
src_str + i, output + i )
== 0 ); == 0 );
} }
hexify( dst_str, output, data_len ); hexify( dst_str, output, data_len );