[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=91b6718f821417840bc543077f343f07d2c45314
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

91b6718 by Peter Wu (peter@xxxxxxxxxxxxx):

    ssl: fix app_data handle detection
    
    When desegmentation is disabled (as is done with the SSL Decryption
    (master secret)" test), the app_data dissection is ignored because the
    app_data dissector it not yet known. Fix this by continuing when the
    port-based dissector is known (as was done before).
    
    Also add avoid setting a "(null)" protocol in the tree when the
    app_handle is not set (because the encrypted data is not decrypted for
    example, or when the heuristics dissector fails to set a protocol).
    
    Fixes regression since v2.1.0rc0-1501-g50dc0e8 ("ssl: improve
    interaction with heuristics subdissectors").
    
    Change-Id: I65c1d4705dec8f6fea8b7ac02151fab9dc6152d6
    Reviewed-on: https://code.wireshark.org/review/13312
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  183732fb  Improve Error messages when failing to load pcapng files
    adds  91b6718   ssl: fix app_data handle detection


Summary of changes:
 epan/dissectors/packet-ssl.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)