Wireshark-commits: [Wireshark-commits] master-1.12 3ad49f7: new_key is used only for TKIP keys; set

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 21 Dec 2015 12:24:27 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3ad49f7a004eb806990f942205f7a15e7d31ba08
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

3ad49f7 by Guy Harris (guy@xxxxxxxxxxxx):

    new_key is used only for TKIP keys; set it only in that part of the code.
    
    Change-Id: I64424731e4d5f94c7b69436b5318b67a14471171
    Reviewed-on: https://code.wireshark.org/review/8372
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit dac801545446180cc593bdd4f13a65488defb6e4)
    Reviewed-on: https://code.wireshark.org/review/12784
    

Actions performed:

    from  239c02b   Allocate the unwrapped key in AES_unwrap().
    adds  3ad49f7   new_key is used only for TKIP keys; set it only in that part of the code.


Summary of changes:
 epan/crypt/airpdcap.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)