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

wlantest: Remove CCMP specific AAD handling from GCMP

Browse source 
GCMP encodes length of AAD differently, so remove the unnecessary
code that got copied from the CCMP implementation.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-09-08 22:10:05 +03:00
parent 37c8fe2e3b
commit b4a5fcb286
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wlantest/gcmp.c
View file

@ -386,7 +386,7 @@ static void gcmp_aad_nonce(const struct ieee80211_hdr *hdr, const u8 *data,
u8 * gcmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr, u8 * gcmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr,
const u8 *data, size_t data_len, size_t *decrypted_len) const u8 *data, size_t data_len, size_t *decrypted_len)
{ {
u8 aad[2 + 30], nonce[12], *plain; u8 aad[30], nonce[12], *plain;
size_t aad_len, mlen; size_t aad_len, mlen;
const u8 *m; const u8 *m;
@ -401,12 +401,11 @@ u8 * gcmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr,
mlen = data_len - 8 - 16; mlen = data_len - 8 - 16;
os_memset(aad, 0, sizeof(aad)); os_memset(aad, 0, sizeof(aad));
gcmp_aad_nonce(hdr, data, &aad[2], &aad_len, nonce); gcmp_aad_nonce(hdr, data, aad, &aad_len, nonce);
WPA_PUT_BE16(aad, aad_len); wpa_hexdump(MSG_EXCESSIVE, "GCMP AAD", aad, aad_len);
wpa_hexdump(MSG_EXCESSIVE, "GCMP AAD", &aad[2], aad_len);
wpa_hexdump(MSG_EXCESSIVE, "GCMP nonce", nonce, sizeof(nonce)); wpa_hexdump(MSG_EXCESSIVE, "GCMP nonce", nonce, sizeof(nonce));
if (aes_gcm_ad(tk, nonce, m, mlen, &aad[2], aad_len, m + mlen, plain) < if (aes_gcm_ad(tk, nonce, m, mlen, aad, aad_len, m + mlen, plain) <
0) { 0) {
u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); u16 seq_ctrl = le_to_host16(hdr->seq_ctrl);
wpa_printf(MSG_INFO, "Invalid GCMP frame: A1=" MACSTR wpa_printf(MSG_INFO, "Invalid GCMP frame: A1=" MACSTR
@ -427,7 +426,7 @@ u8 * gcmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr,
u8 * gcmp_encrypt(const u8 *tk, u8 *frame, size_t len, size_t hdrlen, u8 *qos, u8 * gcmp_encrypt(const u8 *tk, u8 *frame, size_t len, size_t hdrlen, u8 *qos,
u8 *pn, int keyid, size_t *encrypted_len) u8 *pn, int keyid, size_t *encrypted_len)
{ {
u8 aad[2 + 30], nonce[12], *crypt, *pos; u8 aad[30], nonce[12], *crypt, *pos;
size_t aad_len, plen; size_t aad_len, plen;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
@ -453,12 +452,11 @@ u8 * gcmp_encrypt(const u8 *tk, u8 *frame, size_t len, size_t hdrlen, u8 *qos,
*pos++ = pn[0]; /* PN5 */ *pos++ = pn[0]; /* PN5 */
os_memset(aad, 0, sizeof(aad)); os_memset(aad, 0, sizeof(aad));
gcmp_aad_nonce(hdr, crypt + hdrlen, &aad[2], &aad_len, nonce); gcmp_aad_nonce(hdr, crypt + hdrlen, aad, &aad_len, nonce);
WPA_PUT_BE16(aad, aad_len); wpa_hexdump(MSG_EXCESSIVE, "GCMP AAD", aad, aad_len);
wpa_hexdump(MSG_EXCESSIVE, "GCMP AAD", &aad[2], aad_len);
wpa_hexdump(MSG_EXCESSIVE, "GCMP nonce", nonce, sizeof(nonce)); wpa_hexdump(MSG_EXCESSIVE, "GCMP nonce", nonce, sizeof(nonce));
if (aes_gcm_ae(tk, nonce, frame + hdrlen, plen, &aad[2], aad_len, if (aes_gcm_ae(tk, nonce, frame + hdrlen, plen, aad, aad_len,
pos, pos + plen) < 0) { pos, pos + plen) < 0) {
os_free(crypt); os_free(crypt);
return NULL; return NULL;