DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

EAP-pwd: Move EC group initialization to earlier step

Browse source 
This is needed for adding support for salted passwords.

Signed-off-by: Dan Harkins <dharkins@lounge.org>
This commit is contained in:
Dan Harkins 2018-05-25 21:40:04 +03:00 committed by Jouni Malinen
parent b829e4b694
commit 2a5c291881
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/eap_common/eap_pwd_common.c
View file

@ -81,6 +81,27 @@ static int eap_pwd_kdf(const u8 *key, size_t keylen, const u8 *label,
} }
EAP_PWD_group * get_eap_pwd_group(u16 num)
{
EAP_PWD_group *grp;
grp = os_zalloc(sizeof(EAP_PWD_group));
if (!grp)
return NULL;
grp->group = crypto_ec_init(num);
if (!grp->group) {
wpa_printf(MSG_INFO, "EAP-pwd: unable to create EC group");
os_free(grp);
return NULL;
}
grp->group_num = num;
wpa_printf(MSG_INFO, "EAP-pwd: provisioned group %d", num);
return grp;
}
/* /*
* compute a "random" secret point on an elliptic curve based * compute a "random" secret point on an elliptic curve based
* on the password and identities. * on the password and identities.
@ -97,12 +118,8 @@ int compute_password_element(EAP_PWD_group *grp, u16 num,
size_t primebytelen, primebitlen; size_t primebytelen, primebitlen;
struct crypto_bignum *x_candidate = NULL, *rnd = NULL, *cofactor = NULL; struct crypto_bignum *x_candidate = NULL, *rnd = NULL, *cofactor = NULL;
grp->pwe = NULL; if (grp->pwe)
grp->group = crypto_ec_init(num); return -1;
if (!grp->group) {
wpa_printf(MSG_INFO, "EAP-pwd: unable to create EC group");
goto fail;
}
cofactor = crypto_bignum_init(); cofactor = crypto_bignum_init();
grp->pwe = crypto_ec_point_init(grp->group); grp->pwe = crypto_ec_point_init(grp->group);
@ -234,11 +251,8 @@ int compute_password_element(EAP_PWD_group *grp, u16 num,
break; break;
} }
wpa_printf(MSG_DEBUG, "EAP-pwd: found a PWE in %d tries", ctr); wpa_printf(MSG_DEBUG, "EAP-pwd: found a PWE in %d tries", ctr);
grp->group_num = num;
if (0) { if (0) {
fail: fail:
crypto_ec_deinit(grp->group);
grp->group = NULL;
crypto_ec_point_deinit(grp->pwe, 1); crypto_ec_point_deinit(grp->pwe, 1);
grp->pwe = NULL; grp->pwe = NULL;
ret = 1; ret = 1;

1
src/eap_common/eap_pwd_common.h
View file

@ -50,6 +50,7 @@ struct eap_pwd_id {
} STRUCT_PACKED; } STRUCT_PACKED;
/* common routines */ /* common routines */
EAP_PWD_group * get_eap_pwd_group(u16 num);
int compute_password_element(EAP_PWD_group *grp, u16 num, int compute_password_element(EAP_PWD_group *grp, u16 num,
const u8 *password, size_t password_len, const u8 *password, size_t password_len,
const u8 *id_server, size_t id_server_len, const u8 *id_server, size_t id_server_len,

2
src/eap_peer/eap_pwd.c
View file

@ -265,7 +265,7 @@ eap_pwd_perform_id_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
wpa_hexdump_ascii(MSG_INFO, "EAP-PWD (peer): server sent id of", wpa_hexdump_ascii(MSG_INFO, "EAP-PWD (peer): server sent id of",
data->id_server, data->id_server_len); data->id_server, data->id_server_len);
data->grp = os_zalloc(sizeof(EAP_PWD_group)); data->grp = get_eap_pwd_group(data->group_num);
if (data->grp == NULL) { if (data->grp == NULL) {
wpa_printf(MSG_INFO, "EAP-PWD: failed to allocate memory for " wpa_printf(MSG_INFO, "EAP-PWD: failed to allocate memory for "
"group"); "group");

2
src/eap_server/eap_server_pwd.c
View file

@ -562,7 +562,7 @@ static void eap_pwd_process_id_resp(struct eap_sm *sm,
wpa_hexdump_ascii(MSG_DEBUG, "EAP-PWD (server): peer sent id of", wpa_hexdump_ascii(MSG_DEBUG, "EAP-PWD (server): peer sent id of",
data->id_peer, data->id_peer_len); data->id_peer, data->id_peer_len);
data->grp = os_zalloc(sizeof(EAP_PWD_group)); data->grp = get_eap_pwd_group(data->group_num);
if (data->grp == NULL) { if (data->grp == NULL) {
wpa_printf(MSG_INFO, "EAP-PWD: failed to allocate memory for " wpa_printf(MSG_INFO, "EAP-PWD: failed to allocate memory for "
"group"); "group");