aboutsummaryrefslogtreecommitdiffstats
path: root/src/eap_common
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2014-07-28 10:35:20 -0700
committerDmitry Shmidt <dimitrysh@google.com>2014-07-28 10:35:20 -0700
commit7f0b69e88015ca077ef7a417fde0a76c10df23a5 (patch)
tree7d9b472e39d46cf4a224559dd0dae400bc447b0d /src/eap_common
parent0f4fce149db4f45a9eb6776186c1858f8083e6f4 (diff)
downloadandroid_external_wpa_supplicant_8-7f0b69e88015ca077ef7a417fde0a76c10df23a5.tar.gz
android_external_wpa_supplicant_8-7f0b69e88015ca077ef7a417fde0a76c10df23a5.tar.bz2
android_external_wpa_supplicant_8-7f0b69e88015ca077ef7a417fde0a76c10df23a5.zip
Cumulative patch from commit e8c08c9a363340c45baf8e13c758c99078bc0d8b
e8c08c9 EAP-FAST server: Fix potential read-after-buffer (by one byte) 8b65fef Interworking: Remove unnecessary placeholder for PAME-BI 27a725c EAP: Do not allow fast session resumption with different network block 52f4abf P2P: Remove PSK/passphrase from P2P-GROUP-STARTED debug log entry f8723e1 P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events 905c722 Add wpa_msg_global_ctrl() 1f1fe19 EAP-pwd: Clear identity string and temporary buffer explicitly f119d66 EAP-pwd: Verify BN_rand_range return code 5197f03 EAP-pwd: Use os_memcmp_const() for hash comparisons 26c10f7 OpenSSL: Use EC_POINT_clear_free instead of EC_POINT_free 3248071 OpenSSL: Use BN_clear_free instead of BN_free 870dfe9 EAP-TTLS: Remove FreeRADIUS workaround for EAP-TTLS/MSCHAPv2 Bug: 15615050, 16493485 Change-Id: I7028a61ad6dbda1f336376cc0568b81046045725 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eap_common')
-rw-r--r--src/eap_common/eap_pwd_common.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/eap_common/eap_pwd_common.c b/src/eap_common/eap_pwd_common.c
index 96c9efd8..fdcff7fa 100644
--- a/src/eap_common/eap_pwd_common.c
+++ b/src/eap_common/eap_pwd_common.c
@@ -263,18 +263,18 @@ int compute_password_element(EAP_PWD_group *grp, u16 num,
fail:
EC_GROUP_free(grp->group);
grp->group = NULL;
- EC_POINT_free(grp->pwe);
+ EC_POINT_clear_free(grp->pwe);
grp->pwe = NULL;
- BN_free(grp->order);
+ BN_clear_free(grp->order);
grp->order = NULL;
- BN_free(grp->prime);
+ BN_clear_free(grp->prime);
grp->prime = NULL;
ret = 1;
}
/* cleanliness and order.... */
- BN_free(cofactor);
- BN_free(x_candidate);
- BN_free(rnd);
+ BN_clear_free(cofactor);
+ BN_clear_free(x_candidate);
+ BN_clear_free(rnd);
os_free(prfbuf);
return ret;