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

Merge branch 'bugfix/xts_compile_err_3.1' into 'release/v3.1'

Browse source 
Bugfix/xts compile err 3.1

See merge request idf/esp-idf!3747
This commit is contained in:
Ivan Grokhotkov 2018-12-10 17:41:29 +08:00
parent 0b3fdf420f 76f98a4b36
commit 07e8b35ead
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -1016,6 +1016,12 @@ UT_001_32:
- ESP32_IDF - ESP32_IDF
- UT_T1_1 - UT_T1_1
UT_001_32:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_1
UT_002_01: UT_002_01:
<<: *unit_test_template <<: *unit_test_template
tags: tags:

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