3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00

sae: check if server point/scalar is valid

Reported-By: Mathy Vanhoef <Mathy.Vanhoef@nyu.edu>
This commit is contained in:
James Prestwood 2019-04-10 11:54:14 -07:00 committed by Denis Kenzior
parent 9192f506d3
commit 43c1bdfd62

View File

@ -274,6 +274,8 @@ static bool sae_compute_pwe(struct sae_sm *sm, char *password,
sae_pwd_seed(addr1, addr2, base, base_len, counter, pwd_seed); sae_pwd_seed(addr1, addr2, base, base_len, counter, pwd_seed);
pwd_value = sae_pwd_value(sm->curve, pwd_seed); pwd_value = sae_pwd_value(sm->curve, pwd_seed);
if (!pwd_value)
continue;
if (sae_is_quadradic_residue(sm->curve, pwd_value, qr, qnr)) { if (sae_is_quadradic_residue(sm->curve, pwd_value, qr, qnr)) {
if (found == false) { if (found == false) {
@ -451,11 +453,18 @@ static void sae_process_commit(struct sae_sm *sm, const uint8_t *from,
} }
sm->p_scalar = l_ecc_scalar_new(sm->curve, ptr, nbytes); sm->p_scalar = l_ecc_scalar_new(sm->curve, ptr, nbytes);
if (!sm->p_scalar) {
l_error("Server sent invalid P_Scalar during commit");
reason = MMPDU_REASON_CODE_UNSPECIFIED;
goto reject;
}
ptr += nbytes; ptr += nbytes;
sm->p_element = l_ecc_point_from_data(sm->curve, L_ECC_POINT_TYPE_FULL, sm->p_element = l_ecc_point_from_data(sm->curve, L_ECC_POINT_TYPE_FULL,
ptr, nbytes * 2); ptr, nbytes * 2);
if (!sm->p_element) { if (!sm->p_element) {
l_error("Server sent invalid P_Element during commit");
reason = MMPDU_REASON_CODE_UNSPECIFIED; reason = MMPDU_REASON_CODE_UNSPECIFIED;
goto reject; goto reject;
} }