Wireshark-commits: [Wireshark-commits] master cb3dd95: WPA/WPA2 decoding fixes and improvements
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: Mon, 9 Nov 2015 11:28:32 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cb3dd958af31099772c8934179e113929ae0c020
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

cb3dd95 by Alexander Wetzel (alexander.wetzel@xxxxxx):

    WPA/WPA2 decoding fixes and improvements
    
    - start decoding when we have eapol1+2 packets
      Do not insist on a complete captured handshake, decode what we can.
    
    - more robust way to detect eapol #2 packets
      At least Win 10 is violating the spec on rekey by setting the secure
      bit in #2. Unpatched version shows and handles #2 as #4, breaking
      decoding after rekey.
    
    - fixed eapol rekey key handling
      Inital patch (see https://code.wireshark.org/review/8268)
      is adding redundant keys, since it scans all the time
      and not only once.
    
    - ignore tailing garbage after eapol sections in frame
      See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9065#c8
    
    Included testcase to test decode for incomplete handshakes and eapol2
    packets with secure bit set on rekey.
    
    Ping-Bug: 9065
    Change-Id: Id775088db9b5aaa80da9efdeed6902d024b5c0cd
    Reviewed-on: https://code.wireshark.org/review/11484
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  d4985a5   idl2wrs: fix some glibc calls in favour of glib.
    adds  cb3dd95   WPA/WPA2 decoding fixes and improvements


Summary of changes:
 epan/crypt/airpdcap.c                 |  367 +++++++++++++++------------------
 epan/crypt/airpdcap_debug.h           |    2 +-
 epan/crypt/airpdcap_system.h          |    3 +-
 epan/crypt/airpdcap_user.h            |   11 +
 epan/dissectors/packet-ieee80211.c    |   87 +++-----
 test/captures/wpa-test-decode.pcap.gz |  Bin 0 -> 167294 bytes
 test/config/80211_keys.tmpl           |    1 +
 test/suite-decryption.sh              |   17 ++
 8 files changed, 227 insertions(+), 261 deletions(-)
 create mode 100644 test/captures/wpa-test-decode.pcap.gz