Wireshark · Wireshark-commits: [Wireshark-commits] master 341c3f3: ieee80211: Avoid decrypting packets two times

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=341c3f3c624e170b664a95440a974aece976cac9
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

341c3f3 by Mikael Kanstrup (mikael.kanstrup@xxxxxxxx):

    ieee80211: Avoid decrypting packets two times
    
    Encrypted packets were decrypted two times. One time to scan for
    new keys. If no keys were found the decrypted data was simply
    discarded. Then later on the packet was decrypted again for
    dissection.
    
    Avoid decrypting packets two times by storing the result from first
    decryption if no key was found. Skip the second attempt.
    
    Note though that in the special case where a key was actually found
    inside an encrypted packet the decryption will still be performed
    twice. First time decrypt, discover the key, and return the EAPOL
    keydata. Second time decrypt and return the decrypted frame.
    
    Change-Id: I1acd0060d4e1f351fb15070f8d7aa78c0035ce39
    Reviewed-on: https://code.wireshark.org/review/30568
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  61ccf52   ieee80211: Decrypt and dissect EAPOL keydata
     add  341c3f3   ieee80211: Avoid decrypting packets two times


Summary of changes:
 epan/crypt/dot11decrypt.c          | 20 ++++------
 epan/crypt/dot11decrypt_system.h   |  6 +--
 epan/dissectors/packet-ieee80211.c | 76 +++++++++++++++++++++-----------------
 3 files changed, 52 insertions(+), 50 deletions(-)