Wireshark-commits: [Wireshark-commits] lts-1.12.1 9a76c29: Fix previous change.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 25 Jun 2016 22:22:51 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9a76c295c93f8697791bdd4d09c735c9eb412f7b
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark

Commits:

9a76c29 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix previous change.
    
    In 1.12, an EAPOL_RSN_KEY structure has an extra
    TKIP_GROUP_KEYBYTES_LEN_MAX-byte array at the end; that's not there in
    2.0 and later.
    
    So comparing against sizeof(EAPOL_RSN_KEY) does different things in 1.12
    and 2.x.
    
    Instead, we should compare against RSN_KEY_WITHOUT_KEYBYTES_LEN, as that
    has the same value in 1.12 as sizeof(EAPOL_RSN_KEY) has in 2.x.
    
    Change-Id: I5464c592cf42ae1bab6b878b049c40ef63a5fd51
    Reviewed-on: https://code.wireshark.org/review/15548
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/16140
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  9ab8209   Make sure EAPOL body is big enough for a EAPOL_RSN_KEY.
    adds  9a76c29   Fix previous change.


Summary of changes:
 epan/crypt/airpdcap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)