Wireshark-commits: [Wireshark-commits] master 5f0edb2: ssl-utils: refactor AEAD decryption handling
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 31 Jan 2017 04:43:49 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5f0edb2ebacb6eedf81066e0738c03cc8e564e96
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5f0edb2 by Peter Wu (peter@xxxxxxxxxxxxx):

    ssl-utils: refactor AEAD decryption handling
    
    The current ssl_decrypt_record is hard to understand due to mixing CBC
    concepts (MAC, padding) with AEAD. Extract the AEAD functionality and
    use better variable naming.
    
    The "Plaintext" debug print now includes just the plaintext (the auth
    tag is stripped). A write_iv.data_len check is added just to be sure and
    more prep work is done for auth tag validation and TLS 1.3 support.
    
    Tested against the (D)TLS AEAD tests on Libgcrypt 1.4.5 (CentOS 6),
    1.6.5 (Ubuntu 14.04), 1.7.6 (Arch Linux). Compile-tested w/o Libgcrypt.
    
    Change-Id: I94dd2fd70e1281d85c954abfe523f7483d9ac68b
    Reviewed-on: https://code.wireshark.org/review/19852
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  7e7445c   Have hfinfo_format_text use format_text_wmem.
    adds  5f0edb2   ssl-utils: refactor AEAD decryption handling


Summary of changes:
 epan/dissectors/packet-dtls.c      |    9 +-
 epan/dissectors/packet-ssl-utils.c |  197 +++++++++++++++++++++---------------
 epan/dissectors/packet-ssl-utils.h |   10 +-
 epan/dissectors/packet-ssl.c       |   16 +--
 4 files changed, 137 insertions(+), 95 deletions(-)