Wireshark-commits: [Wireshark-commits] master-2.2 4a85ac3: ssl: fix exact matching of ALPN protocol
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, 27 Sep 2016 02:07:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4a85ac3956f49fd4b404b2cd2d78d256d5b2e2fe
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

4a85ac3 by Peter Wu (peter@xxxxxxxxxxxxx):

    ssl: fix exact matching of ALPN protocol names
    
    The "name_length >= alpn_proto->proto_name_len" condition always failed
    to match for short names (like "h2" where the reported length is 2, but
    the proto_name_len would be 3).
    
    This fixes recognition of HTTP/2 traffic, without this patch it would be
    interpreted as http-over-tls as reported on
    https://ask.wireshark.org/questions/55720/how-to-install-http2-dissector-plugin
    
    Change-Id: Idc3eae0b6d593c8f3c435230ef76da90a4b1e7fc
    Reviewed-on: https://code.wireshark.org/review/17907
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 75ae538514f55f8faa114ce31fc5a2a1d7b7ef22)
    Reviewed-on: https://code.wireshark.org/review/17912
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  67597cb   Register ncp2222 dissector
    adds  4a85ac3   ssl: fix exact matching of ALPN protocol names


Summary of changes:
 epan/dissectors/packet-ssl-utils.c |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)