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

SAE: Remove unnecessary sae_derive_k() wrapper

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-01-06 18:59:46 +02:00
parent f05dad2090
commit 30846fa65f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/sae.c
View file

@ -568,14 +568,6 @@ fail:
}
static int sae_derive_k(struct sae_data *sae, u8 *k)
{
if (sae->ec)
return sae_derive_k_ecc(sae, k);
return sae_derive_k_ffc(sae, k);
}
static int sae_derive_keys(struct sae_data *sae, const u8 *k)
{
u8 null_key[SAE_KEYSEED_KEY_LEN], val[SAE_MAX_PRIME_LEN];
@ -619,7 +611,9 @@ fail:
int sae_process_commit(struct sae_data *sae)
{
u8 k[SAE_MAX_PRIME_LEN];
if (sae_derive_k(sae, k) < 0 || sae_derive_keys(sae, k) < 0)
if ((sae->ec && sae_derive_k_ecc(sae, k) < 0) ||
(sae->dh && sae_derive_k_ffc(sae, k) < 0) ||
sae_derive_keys(sae, k) < 0)
return -1;
return 0;
}