Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/xts_compile_err' into 'master'

Browse source 
mbedtls: Fix compilation errors when CONFIG_MBEDTLS_HARDWARE_AES is disabled

See merge request idf/esp-idf!3506
This commit is contained in:
Ivan Grokhotkov 2018-11-05 16:58:38 +08:00
parent ada3bc3fb5 fbcc160675
commit 761d44bd36
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -1736,4 +1736,4 @@ IT_015_01:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_4 - SSC_T2_4

6
components/esp32/hwcrypto/aes.c
View file

@ -425,7 +425,7 @@ static int esp_aes_xts_decode_keys( const unsigned char *key,
return 0; return 0;
} }
int esp_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx, int esp_aes_xts_setkey_enc( esp_aes_xts_context *ctx,
const unsigned char *key, const unsigned char *key,
unsigned int keybits) unsigned int keybits)
{ {
@ -447,7 +447,7 @@ int esp_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
return esp_aes_setkey( &ctx->crypt, key1, key1bits ); return esp_aes_setkey( &ctx->crypt, key1, key1bits );
} }
int esp_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx, int esp_aes_xts_setkey_dec( esp_aes_xts_context *ctx,
const unsigned char *key, const unsigned char *key,
unsigned int keybits) unsigned int keybits)
{ {
@ -526,7 +526,7 @@ static void esp_gf128mul_x_ble( unsigned char r[16],
/* /*
* AES-XTS buffer encryption/decryption * AES-XTS buffer encryption/decryption
*/ */
int esp_aes_crypt_xts( mbedtls_aes_xts_context *ctx, int esp_aes_crypt_xts( esp_aes_xts_context *ctx,
int mode, int mode,
size_t length, size_t length,
const unsigned char data_unit[16], const unsigned char data_unit[16],

3
tools/unit-test-app/configs/aes_no_hw Normal file
View file

@ -0,0 +1,3 @@
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update
TEST_COMPONENTS=mbedtls
CONFIG_MBEDTLS_HARDWARE_AES=n