Skip to content

Commit 45eb556

Browse files
committed
Merge branch 'bugfix/wpa2_assert_when_use_sha256_signature' into 'master'
bugfix of wpa2 assert when use sha256 do signature See merge request idf/esp-idf!2089
2 parents f213223 + bc97b0f commit 45eb556

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/esp32/fast_crypto_ops.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const wpa2_crypto_funcs_t g_wifi_default_wpa2_crypto_funcs = {
5555
.crypto_cipher_encrypt = (esp_crypto_cipher_encrypt_t)fast_crypto_cipher_encrypt,
5656
.crypto_cipher_decrypt = (esp_crypto_cipher_decrypt_t)fast_crypto_cipher_decrypt,
5757
.crypto_cipher_deinit = (esp_crypto_cipher_deinit_t)fast_crypto_cipher_deinit,
58-
.sha256_vector = (esp_sha256_vector_t)fast_sha256_vector,
59-
.crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp
58+
.crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp,
59+
.sha256_vector = (esp_sha256_vector_t)fast_sha256_vector
6060
};
6161

components/esp32/include/esp_wifi_crypto_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ typedef struct {
296296
esp_crypto_cipher_encrypt_t crypto_cipher_encrypt; /**< function used to encrypt cipher when use TLSV1 */
297297
esp_crypto_cipher_decrypt_t crypto_cipher_decrypt; /**< function used to decrypt cipher when use TLSV1 */
298298
esp_crypto_cipher_deinit_t crypto_cipher_deinit; /**< function used to free context when use TLSV1 */
299-
esp_sha256_vector_t sha256_vector; /**< function used to do X.509v3 certificate parsing and processing */
300299
esp_crypto_mod_exp_t crypto_mod_exp; /**< function used to do key exchange when use TLSV1 */
300+
esp_sha256_vector_t sha256_vector; /**< function used to do X.509v3 certificate parsing and processing */
301301
} wpa2_crypto_funcs_t;
302302

303303
#ifdef __cplusplus

0 commit comments

Comments
 (0)