From bc97b0f380210b97b7fd98c5f304af7e83c28b7f Mon Sep 17 00:00:00 2001 From: Deng Xin Date: Mon, 19 Mar 2018 21:18:37 +0800 Subject: [PATCH] bugfix of wpa2 assert when use sha256 do signature The order of wpa2_crypto_funcs_t structure mismatch between IDF and wifi libray close github issue https://github.com/espressif/esp-idf/issues/1297 --- components/esp32/fast_crypto_ops.c | 4 ++-- components/esp32/include/esp_wifi_crypto_types.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp32/fast_crypto_ops.c b/components/esp32/fast_crypto_ops.c index 23c79885b..66c8e19af 100644 --- a/components/esp32/fast_crypto_ops.c +++ b/components/esp32/fast_crypto_ops.c @@ -55,7 +55,7 @@ const wpa2_crypto_funcs_t g_wifi_default_wpa2_crypto_funcs = { .crypto_cipher_encrypt = (esp_crypto_cipher_encrypt_t)fast_crypto_cipher_encrypt, .crypto_cipher_decrypt = (esp_crypto_cipher_decrypt_t)fast_crypto_cipher_decrypt, .crypto_cipher_deinit = (esp_crypto_cipher_deinit_t)fast_crypto_cipher_deinit, - .sha256_vector = (esp_sha256_vector_t)fast_sha256_vector, - .crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp + .crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp, + .sha256_vector = (esp_sha256_vector_t)fast_sha256_vector }; diff --git a/components/esp32/include/esp_wifi_crypto_types.h b/components/esp32/include/esp_wifi_crypto_types.h index e1f2cf824..63f7b1db9 100644 --- a/components/esp32/include/esp_wifi_crypto_types.h +++ b/components/esp32/include/esp_wifi_crypto_types.h @@ -296,8 +296,8 @@ typedef struct { esp_crypto_cipher_encrypt_t crypto_cipher_encrypt; /**< function used to encrypt cipher when use TLSV1 */ esp_crypto_cipher_decrypt_t crypto_cipher_decrypt; /**< function used to decrypt cipher when use TLSV1 */ esp_crypto_cipher_deinit_t crypto_cipher_deinit; /**< function used to free context when use TLSV1 */ - esp_sha256_vector_t sha256_vector; /**< function used to do X.509v3 certificate parsing and processing */ esp_crypto_mod_exp_t crypto_mod_exp; /**< function used to do key exchange when use TLSV1 */ + esp_sha256_vector_t sha256_vector; /**< function used to do X.509v3 certificate parsing and processing */ } wpa2_crypto_funcs_t; #ifdef __cplusplus