alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 12:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls: Revert changes to upstream library sources.

Browse Source 
This reverts part of commit 0f83831c74.
This commit is contained in:
Angus Gratton
2016-09-09 14:10:44 +10:00
parent 6f006c25fb
commit eb47a25012
4 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/mbedtls/library/aes.c
View File

@@ -1237,8 +1237,9 @@ int mbedtls_aes_self_test( int verbose )
unsigned char stream_block[16];
#endif
mbedtls_aes_context ctx;
memset( key, 0, 32 );
memset( key, 0, 32 );
mbedtls_aes_init( &ctx );
/*
* ECB mode
@@ -1254,8 +1255,6 @@ int mbedtls_aes_self_test( int verbose )
memset( buf, 0, 16 );
mbedtls_aes_init( &ctx );
if( v == MBEDTLS_AES_DECRYPT )
{
mbedtls_aes_setkey_dec( &ctx, key, 128 + u * 64 );
@@ -1268,7 +1267,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "failed\n" );
mbedtls_aes_free( &ctx );
ret = 1;
goto exit;
}
@@ -1285,8 +1283,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "failed\n" );
mbedtls_aes_free( &ctx );
ret = 1;
goto exit;
}
@@ -1294,8 +1290,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "passed\n" );
mbedtls_aes_free( &ctx );
}
if( verbose != 0 )
@@ -1318,8 +1312,6 @@ int mbedtls_aes_self_test( int verbose )
memset( prv, 0, 16 );
memset( buf, 0, 16 );
mbedtls_aes_init( &ctx );
if( v == MBEDTLS_AES_DECRYPT )
{
mbedtls_aes_setkey_dec( &ctx, key, 128 + u * 64 );
@@ -1332,8 +1324,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "failed\n" );
mbedtls_aes_free( &ctx );
ret = 1;
goto exit;
}
@@ -1358,8 +1348,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "failed\n" );
mbedtls_aes_free( &ctx );
ret = 1;
goto exit;
}
@@ -1367,8 +1355,6 @@ int mbedtls_aes_self_test( int verbose )
if( verbose != 0 )
mbedtls_printf( "passed\n" );
mbedtls_aes_free( &ctx );
}
if( verbose != 0 )
@@ -1391,8 +1377,6 @@ int mbedtls_aes_self_test( int verbose )
memcpy( iv, aes_test_cfb128_iv, 16 );
memcpy( key, aes_test_cfb128_key[u], 16 + u * 8 );
mbedtls_aes_init( &ctx );
offset = 0;
mbedtls_aes_setkey_enc( &ctx, key, 128 + u * 64 );
@@ -1449,8 +1433,6 @@ int mbedtls_aes_self_test( int verbose )
memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
memcpy( key, aes_test_ctr_key[u], 16 );
mbedtls_aes_init( &ctx );
offset = 0;
mbedtls_aes_setkey_enc( &ctx, key, 128 );