Wireshark-commits: [Wireshark-commits] master acb6781: TLS: allow QUIC dissector to pass HKDF label
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: Wed, 21 Feb 2018 13:40:07 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=acb6781012409b391592096127460fcfd9b648d7
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

acb6781 by Peter Wu (peter@xxxxxxxxxxxxx):

    TLS: allow QUIC dissector to pass HKDF label for ciphers
    
    To support decryption of future drafts of QUIC, the HKDF label must be
    configurable by the QUIC dissector. Currently it can only select between
    "tls13 " and "TLS 1.3, " which is not sufficient (it needs "QUIC ").
    
    Change "tls13_hkdf_expand_label" and "tls13_cipher_create" to accept the
    label prefix directly instead of just a TLS 1.3 draft version number.
    
    Change-Id: I466a6e1a8f4b051f5775e7d8d6658641a1ae7fb1
    Reviewed-on: https://code.wireshark.org/review/25961
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  62d34fc   Squelch some cating-away-constness warnings.
    adds  acb6781   TLS: allow QUIC dissector to pass HKDF label for ciphers


Summary of changes:
 epan/dissectors/packet-quic.c      | 11 +++++----
 epan/dissectors/packet-ssl-utils.c | 46 ++++++++++++++++++++------------------
 epan/dissectors/packet-ssl-utils.h |  8 +++----
 3 files changed, 33 insertions(+), 32 deletions(-)