Wireshark-commits: [Wireshark-commits] master-2.0 6c094dc: g_malloc the decrypted key in AES_unwrap

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: Mon, 21 Dec 2015 20:56:45 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6c094dcf0172d85c25c4286899d8b177ad8e4ab1
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

6c094dc by Guy Harris (guy@xxxxxxxxxxxx):

    g_malloc the decrypted key in AES_unwrap(), but always free it.
    
    It doesn't need to exist after AirPDcapDecryptWPABroadcastKey() returns.
    
    Change-Id: Ifaf08dfb285be3cf54429f7b77d44565962d4450
    Reviewed-on: https://code.wireshark.org/review/12808
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit a3e80157c830e75a8b7c5bae89dabd943c7bfc85)
    Reviewed-on: https://code.wireshark.org/review/12809
    

Actions performed:

    from  baad089   g_mallocate the encrypted key, but free it in all paths out of the function.
    adds  6c094dc   g_malloc the decrypted key in AES_unwrap(), but always free it.


Summary of changes:
 epan/crypt/airpdcap.c          |    4 ++++
 epan/crypt/airpdcap_rijndael.c |    3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)