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

EAP-pwd: Fix the argument name in compute_keys()

Browse source 
The parameters used here are confirm, not commit values.

Signed-hostap: Dan Harkins <dharkins@lounge.org>
This commit is contained in:
Dan Harkins 2012-02-11 12:14:31 +02:00 committed by Jouni Malinen
parent 3f6e50ac28
commit a7cbb4753c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/eap_common/eap_pwd_common.c
View file

@ -277,7 +277,7 @@ int compute_password_element(EAP_PWD_group *grp, u16 num,
int compute_keys(EAP_PWD_group *grp, BN_CTX *bnctx, BIGNUM *k, int compute_keys(EAP_PWD_group *grp, BN_CTX *bnctx, BIGNUM *k,
BIGNUM *peer_scalar, BIGNUM *server_scalar, BIGNUM *peer_scalar, BIGNUM *server_scalar,
u8 *commit_peer, u8 *commit_server, u8 *confirm_peer, u8 *confirm_server,
u32 *ciphersuite, u8 *msk, u8 *emsk) u32 *ciphersuite, u8 *msk, u8 *emsk)
{ {
HMAC_CTX ctx; HMAC_CTX ctx;
@ -306,14 +306,14 @@ int compute_keys(EAP_PWD_group *grp, BN_CTX *bnctx, BIGNUM *k,
H_Update(&ctx, cruft, BN_num_bytes(grp->order)); H_Update(&ctx, cruft, BN_num_bytes(grp->order));
H_Final(&ctx, &session_id[1]); H_Final(&ctx, &session_id[1]);
/* then compute MK = H(k | commit-peer | commit-server) */ /* then compute MK = H(k | confirm-peer | confirm-server) */
H_Init(&ctx); H_Init(&ctx);
offset = BN_num_bytes(grp->prime) - BN_num_bytes(k); offset = BN_num_bytes(grp->prime) - BN_num_bytes(k);
os_memset(cruft, 0, BN_num_bytes(grp->prime)); os_memset(cruft, 0, BN_num_bytes(grp->prime));
BN_bn2bin(k, cruft + offset); BN_bn2bin(k, cruft + offset);
H_Update(&ctx, cruft, BN_num_bytes(grp->prime)); H_Update(&ctx, cruft, BN_num_bytes(grp->prime));
H_Update(&ctx, commit_peer, SHA256_DIGEST_LENGTH); H_Update(&ctx, confirm_peer, SHA256_DIGEST_LENGTH);
H_Update(&ctx, commit_server, SHA256_DIGEST_LENGTH); H_Update(&ctx, confirm_server, SHA256_DIGEST_LENGTH);
H_Final(&ctx, mk); H_Final(&ctx, mk);
/* stretch the mk with the session-id to get MSK | EMSK */ /* stretch the mk with the session-id to get MSK | EMSK */