denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EAP-MSCHAPv2 master key derivation, broken with 87dd205b

Browse Source
This commit is contained in:
Martin Willi
2012-07-18 16:46:05 +02:00
parent e7600ca696
commit 09e3717525
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
+12 -4
View File
@@ -461,13 +461,21 @@ static status_t GenerateMSK(chunk_t password_hash_hash,
return FAILED; return FAILED;
} }
master = chunk_create(master_key, 16);
concat = chunk_cata("ccc", password_hash_hash, nt_response, magic1); concat = chunk_cata("ccc", password_hash_hash, nt_response, magic1);
if (!hasher->get_hash(hasher, concat, master_key))
{
hasher->destroy(hasher);
return FAILED;
}
master = chunk_create(master_key, 16);
concat = chunk_cata("cccc", master, shapad1, magic2, shapad2); concat = chunk_cata("cccc", master, shapad1, magic2, shapad2);
if (!hasher->get_hash(hasher, concat, master_receive_key))
{
hasher->destroy(hasher);
return FAILED;
}
concat = chunk_cata("cccc", master, shapad1, magic3, shapad2); concat = chunk_cata("cccc", master, shapad1, magic3, shapad2);
if (!hasher->get_hash(hasher, concat, master_key) || if (!hasher->get_hash(hasher, concat, master_send_key))
!hasher->get_hash(hasher, concat, master_receive_key) ||
!hasher->get_hash(hasher, concat, master_send_key))
{ {
hasher->destroy(hasher); hasher->destroy(hasher);
return FAILED; return FAILED;