Wireshark-commits: [Wireshark-commits] master-1.12 80a097c: Don't try to decrypt with an AES key sh

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: Tue, 8 Sep 2015 00:47:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=80a097cb6b941336d1d864824df6928616d0d6fb
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

80a097c by Guy Harris (guy@xxxxxxxxxxxx):

    Don't try to decrypt with an AES key shorter than 128 bits.
    
    AES keys must be at least 128 bits; AES_unwrap returns a null pointer if
    handed a too-short key, and we then just dereference that null pointer
    and crash.  Just give up with a too-short key.
    
    Bug: 11507
    Change-Id: Id1cf0a43c608597a11ff9df40f3654e6ff30619d
    Reviewed-on: https://code.wireshark.org/review/10422
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 44a0bafd15a8d1e606f87198f679a5fec1a4bfd2)
    Reviewed-on: https://code.wireshark.org/review/10423
    

Actions performed:

    from  403a69b   Declare col_get_text() as WS_DLL_PUBLIC
    adds  80a097c   Don't try to decrypt with an AES key shorter than 128 bits.


Summary of changes:
 epan/crypt/airpdcap.c |    5 +++++
 1 file changed, 5 insertions(+)