jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SAE: Simplify sae_prepare_commit() error path

Browse source 
There is no need to keep separate "return -1" statements for these error
cases.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-06-22 00:38:02 +03:00
parent 5527a3911a
commit 4e37dd6c60
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/sae.c
View file

@ -506,15 +506,12 @@ int sae_prepare_commit(const u8 *addr1, const u8 *addr2,
const u8 *password, size_t password_len, const u8 *password, size_t password_len,
struct sae_data *sae) struct sae_data *sae)
{ {
if (sae->tmp == NULL) if (sae->tmp == NULL ||
return -1; (sae->tmp->ec && sae_derive_pwe_ecc(sae, addr1, addr2, password,
if (sae->tmp->ec && sae_derive_pwe_ecc(sae, addr1, addr2, password, password_len) < 0) ||
password_len) < 0) (sae->tmp->dh && sae_derive_pwe_ffc(sae, addr1, addr2, password,
return -1; password_len) < 0) ||
if (sae->tmp->dh && sae_derive_pwe_ffc(sae, addr1, addr2, password, sae_derive_commit(sae) < 0)
password_len) < 0)
return -1;
if (sae_derive_commit(sae) < 0)
return -1; return -1;
return 0; return 0;
} }