aboutsummaryrefslogtreecommitdiffstats
path: root/wlantest/rx_mgmt.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-01-25 14:49:18 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-26 23:26:49 (GMT)
commit98cd3d1c3b2f2081539a95be26b37aae88b2b0f5 (patch)
tree7ebb32f2312e9feff800426599b6e27e08b0106a /wlantest/rx_mgmt.c
parent287eb3f9d723cbba9493a89049b98c76d75e129a (diff)
downloadhostap-98cd3d1c3b2f2081539a95be26b37aae88b2b0f5.zip
hostap-98cd3d1c3b2f2081539a95be26b37aae88b2b0f5.tar.gz
hostap-98cd3d1c3b2f2081539a95be26b37aae88b2b0f5.tar.bz2
Preparations for variable length KCK and KEK
This modifies struct wpa_ptk to allow the length of KCK and KEK to be stored. This is needed to allow longer keys to be used, e.g., with Suite B 192-bit level. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wlantest/rx_mgmt.c')
-rw-r--r--wlantest/rx_mgmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c
index 2d7ef1d..5f60abe 100644
--- a/wlantest/rx_mgmt.c
+++ b/wlantest/rx_mgmt.c
@@ -1,6 +1,6 @@
/*
* Received Management frame processing
- * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2010-2015, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -983,7 +983,7 @@ static u8 * mgmt_ccmp_decrypt(struct wlantest *wt, const u8 *data, size_t len,
wpa_hexdump(MSG_INFO, "RSC", rsc, 6);
}
- decrypted = ccmp_decrypt(sta->ptk.tk1, hdr, data + 24, len - 24, dlen);
+ decrypted = ccmp_decrypt(sta->ptk.tk, hdr, data + 24, len - 24, dlen);
if (decrypted) {
os_memcpy(rsc, pn, 6);
frame = os_malloc(24 + *dlen);