osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Sho Amano via https://www.wireshark.org/lists/wireshark-dev/201210/msg00186.html: 

Fix WLAN decryption when using a WPA PSK key

svn path=/trunk/; revision=45696
This commit is contained in:
Pascal Quantin 2012-10-21 20:52:39 +00:00
parent 30c709777e
commit ccc0d6bd2a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-ieee80211.c
View File

@ -17369,16 +17369,16 @@ void set_airpdcap_keys(void)
keys->Keys[keys->nKeys] = key; keys->Keys[keys->nKeys] = key;
keys->nKeys++; keys->nKeys++;
} }
else if(dk->type == AIRPDCAP_KEY_TYPE_WPA_PMK) else if(dk->type == AIRPDCAP_KEY_TYPE_WPA_PSK)
{ {
key.KeyType = AIRPDCAP_KEY_TYPE_WPA_PMK; key.KeyType = AIRPDCAP_KEY_TYPE_WPA_PSK;
bytes = g_byte_array_new(); bytes = g_byte_array_new();
hex_str_to_bytes(dk->key->str, bytes, FALSE); hex_str_to_bytes(dk->key->str, bytes, FALSE);
/* XXX - Pass the correct array of bytes... */ /* XXX - Pass the correct array of bytes... */
if (bytes->len <= AIRPDCAP_WPA_PMK_LEN) { if (bytes->len <= AIRPDCAP_WPA_PSK_LEN) {
memcpy(key.KeyData.Wpa.Pmk, bytes->data, bytes->len); memcpy(key.KeyData.Wpa.Psk, bytes->data, bytes->len);
keys->Keys[keys->nKeys] = key; keys->Keys[keys->nKeys] = key;
keys->nKeys++; keys->nKeys++;