Merge branch 'bugfix/fix_sae_test_failure' into 'master'

wpa_supplicant: Fix SAE test-case failure on mbedtls version udpate

See merge request espressif/esp-idf!7792
This commit is contained in:
Jiang Jiang Jian 2020-02-26 22:38:06 +08:00
commit ac55328efd

View file

@ -266,7 +266,7 @@ struct crypto_ec *crypto_ec_init(int group)
return NULL;
}
mbedtls_ecp_group_init( &e->group );
mbedtls_ecp_group_init(&e->group);
if (mbedtls_ecp_group_load(&e->group, grp_id)) {
crypto_ec_deinit(e);
@ -283,7 +283,7 @@ void crypto_ec_deinit(struct crypto_ec *e)
return;
}
mbedtls_ecp_group_free( &e->group );
mbedtls_ecp_group_free(&e->group);
os_free(e);
}
@ -417,6 +417,7 @@ int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
mbedtls_ctr_drbg_context ctr_drbg;
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));
@ -428,8 +429,8 @@ int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
mbedtls_ctr_drbg_random,
&ctr_drbg));
cleanup:
mbedtls_ctr_drbg_free( &ctr_drbg );
mbedtls_entropy_free( &entropy );
mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy);
return ret ? -1 : 0;
}