espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-13 09:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue in wpa_supplicant

Browse Source
This commit is contained in:
Aditya Patwardhan
2022-02-28 16:38:54 +05:30
parent 98194f7ee6
commit 72f12a0c8c
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/wpa_supplicant/src/crypto/crypto_mbedtls-ec.c
View File

@@ -24,7 +24,6 @@
#include "mbedtls/asn1write.h" #include "mbedtls/asn1write.h"
#include "mbedtls/error.h" #include "mbedtls/error.h"
#include "mbedtls/oid.h" #include "mbedtls/oid.h"
#include "mbedtls/private_access.h"
#define ECP_PRV_DER_MAX_BYTES 29 + 3 * MBEDTLS_ECP_MAX_BYTES #define ECP_PRV_DER_MAX_BYTES 29 + 3 * MBEDTLS_ECP_MAX_BYTES
@@ -440,12 +439,26 @@ int crypto_ec_point_cmp(const struct crypto_ec *e,
return mbedtls_ecp_point_cmp((const mbedtls_ecp_point *) a, return mbedtls_ecp_point_cmp((const mbedtls_ecp_point *) a,
(const mbedtls_ecp_point *) b); (const mbedtls_ecp_point *) b);
} }
int crypto_key_compare(struct crypto_key *key1, struct crypto_key *key2) int crypto_key_compare(struct crypto_key *key1, struct crypto_key *key2)
{ {
if (mbedtls_pk_check_pair((mbedtls_pk_context *)key1, (mbedtls_pk_context *)key2, NULL, NULL) < 0) int ret = 0;
return 0; mbedtls_entropy_context entropy;
mbedtls_ctr_drbg_context ctr_drbg;
return 1; mbedtls_entropy_init(&entropy);
mbedtls_ctr_drbg_init(&ctr_drbg);
MBEDTLS_MPI_CHK(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0));
if (mbedtls_pk_check_pair((mbedtls_pk_context *)key1, (mbedtls_pk_context *)key2, mbedtls_ctr_drbg_random, &ctr_drbg) < 0) {
goto cleanup;
}
ret = 1;
cleanup:
mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy);
return ret;
} }
void crypto_debug_print_point(const char *title, struct crypto_ec *e, void crypto_debug_print_point(const char *title, struct crypto_ec *e,

4
components/wpa_supplicant/src/crypto/crypto_mbedtls.c
View File

@@ -35,6 +35,10 @@
#include "crypto.h" #include "crypto.h"
#include "mbedtls/esp_config.h" #include "mbedtls/esp_config.h"
#ifdef MBEDTLS_ARC4_C
#include "mbedtls/arc4.h"
#endif
static int digest_vector(mbedtls_md_type_t md_type, size_t num_elem, static int digest_vector(mbedtls_md_type_t md_type, size_t num_elem,
const u8 *addr[], const size_t *len, u8 *mac) const u8 *addr[], const size_t *len, u8 *mac)
{ {