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

ieee80211: Update RSN cipher and key suite 

Add new value (used by WPA3)

Issue reported by Philipp Ebbecke

Bug: 15168
Change-Id: Iff4a7332dfc57226b191ec34319f0b7a78e30ede
Reviewed-on: https://code.wireshark.org/review/30040
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2018-10-06 11:49:08 +02:00 committed by Anders Broman
parent f99f322a03
commit bc4d7c46f3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12442,9 +12442,14 @@ static const value_string ieee80211_rsn_cipher_vals[] = {
{3, "AES (OCB)"},
{4, "AES (CCM)"},
{5, "WEP (104-bit)"},
{6, "BIP"},
{6, "BIP (128)"},
{7, "Group addressed traffic not allowed"},
{8, "GCMP"},
{8, "GCMP (128)" },
{9, "GCMP (256)" },
{10, "CCMP (256)" },
{11, "BIP (GMAC-128)" },
{12, "BIP (GMAC-256)" },
{13, "BIP (CMAC-256)" },
{0, NULL}
};
@ -12456,7 +12461,13 @@ static const value_string ieee80211_rsn_keymgmt_vals[] = {
{4, "FT using PSK"},
{5, "WPA (SHA256)"},
{6, "PSK (SHA256)"},
{7, "TDLS / TPK Handshake"},
{7, "TDLS / TPK Handshake (SHA256)"},
{8, "SAE (SHA256)" },
{9, "FT using SAE (SHA256)" },
{10, "APPeerKey (SHA256)" },
{11, "WPA (SHA256-SuiteB)" },
{12, "WPA (SHA384-SuiteB)" },
{13, "FT over IEEE 802.1X (SHA384)" },
{18, "Opportunistic Wireless Encryption"},
{0, NULL}
};