Wireshark-commits: [Wireshark-commits] master-2.0 f477ede: [airpcap] Fix parsing of GTK
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 14 Jan 2016 05:25:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f477ede1bfd13713fd959016aa618341a6fe8aad
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

f477ede by Cedric Izoard (cedric.izoard@xxxxxxxxxxxx):

    [airpcap] Fix parsing of GTK
    
    - When parsing key data for GTK, check both the IE ID (0xdd) and OUI-type (00-0F-AC 1)
    as key data may contains more that one IE with ID (0xdd) and GTK KDE is not always the first one
    
    - Determine key type (TKIP/CCMP) based on actual key length and not size of the whole key_data part
    
    - Remove arbitrary limit on size of key_data
    
    Bug: 11973
    Change-Id: I8f71fe970c07a092131eada2be3936c12a61cdd5
    Reviewed-on: https://code.wireshark.org/review/13182
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit b4a1985cef117426a5ec872cadbbf536dd0c636d)
    Reviewed-on: https://code.wireshark.org/review/13278
    

Actions performed:

    from  a5b673b   Swapped align error and crc error bit in EtherCAT Switch Link dissector.
    adds  f477ede   [airpcap] Fix parsing of GTK


Summary of changes:
 epan/crypt/airpdcap.c |   98 ++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 54 deletions(-)