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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bedf118105e54701e78d99bd448b3adf459290cd
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

bedf118 by Peter Wu (peter@xxxxxxxxxxxxx):

    ssl,http: rename http-over-ssl to http-over-tls
    
    This name is displayed in the SSL prototcol tree (Application Data
    Protocol: http-over-tls), rename to avoid possible user confusion.
    
    Modify the SSL dissector such that both "http" and "http-over-tls"
    invoke the same dissector function.
    
    Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc
    Reviewed-on: https://code.wireshark.org/review/17481
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 7c7497a77e30f8098bcaffd0a9c96be24855c0e8)
    Reviewed-on: https://code.wireshark.org/review/17482
    

Actions performed:

    from  f44b4f8   irda: restore a line removed by mistake in ge4c059f
    adds  bedf118   ssl,http: rename http-over-ssl to http-over-tls


Summary of changes:
 epan/dissectors/packet-http.c      |    2 +-
 epan/dissectors/packet-ssl-utils.c |   13 +++++++++++--
 epan/dissectors/packet-ssl-utils.h |    3 +++
 epan/dissectors/packet-ssl.c       |    2 +-
 test/config/ssl_keys.tmpl          |    4 ++--
 test/suite-decryption.sh           |    2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)