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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cd95e197ca78feb1e83ec737b87ada0a1dd57d10
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

cd95e19 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Start renaming SSL to TLS.
    
    Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS"
    over "SSL" in user interface text and in the documentation.
    
    Fix the test_tls_master_secret test while we're here.
    
    Bug: 14922
    Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8
    Reviewed-on: https://code.wireshark.org/review/29649
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  63743a3   QUIC: fix Initial dissection (draft -13)
     add  cd95e19   Start renaming SSL to TLS.


Summary of changes:
 doc/tshark.pod                                     |   8 +-
 doc/wireshark.pod.template                         |   2 +-
 docbook/release-notes.asciidoc                     |   3 +
 docbook/wsdg_src/WSDG_chapter_libraries.asciidoc   |   2 +-
 docbook/wsug_src/WSUG_chapter_advanced.asciidoc    |   4 +-
 docbook/wsug_src/WSUG_chapter_statistics.asciidoc  |   2 +-
 docbook/wsug_src/WSUG_chapter_use.asciidoc         |   2 +-
 docbook/wsug_src/WSUG_chapter_work.asciidoc        |   4 +-
 .../asn1/credssp/packet-credssp-template.c         |   2 +-
 epan/dissectors/asn1/ldap/ldap.cnf                 |   2 +-
 epan/dissectors/asn1/ldap/packet-ldap-template.c   |   8 +-
 epan/dissectors/packet-aim.c                       |   2 +-
 epan/dissectors/packet-amqp.c                      |   8 +-
 epan/dissectors/packet-couchbase.c                 |   4 +-
 epan/dissectors/packet-credssp.c                   |   2 +-
 epan/dissectors/packet-dtls.c                      |   2 +-
 epan/dissectors/packet-eap.c                       |   8 +-
 epan/dissectors/packet-fix.c                       |   2 +-
 epan/dissectors/packet-http.c                      |  12 +-
 epan/dissectors/packet-http2.c                     |   4 +-
 epan/dissectors/packet-imap.c                      |  10 +-
 epan/dissectors/packet-jxta.c                      |  10 +-
 epan/dissectors/packet-ldap.c                      |  10 +-
 epan/dissectors/packet-mq.c                        |   2 +-
 epan/dissectors/packet-mysql.c                     |   8 +-
 epan/dissectors/packet-opa-fe.c                    |   2 +-
 epan/dissectors/packet-openvpn.c                   |   6 +-
 epan/dissectors/packet-pcp.c                       |   2 +-
 epan/dissectors/packet-pgsql.c                     |   6 +-
 epan/dissectors/packet-pop.c                       |   8 +-
 epan/dissectors/packet-quic.c                      |   6 +-
 epan/dissectors/packet-smtp.c                      |   8 +-
 epan/dissectors/packet-spdy.c                      |   2 +-
 epan/dissectors/packet-ssl-utils.c                 |  26 +-
 epan/dissectors/packet-ssl.c                       | 581 +++++++++++----------
 epan/dissectors/packet-stun.c                      |   2 +-
 epan/dissectors/packet-telnet.c                    |   6 +-
 epan/dissectors/packet-turnchannel.c               |   2 +-
 epan/dissectors/packet-xmpp-core.c                 |   2 +-
 epan/follow.h                                      |   2 +-
 test/suite_decryption.py                           |  48 +-
 test/suite_dissection.py                           |   4 +-
 ui/qt/follow_stream_dialog.cpp                     |  12 +-
 ui/qt/main_window.cpp                              |   4 +-
 ui/qt/main_window.h                                |   4 +-
 ui/qt/main_window.ui                               |  12 +-
 ui/qt/main_window_slots.cpp                        |  14 +-
 ui/qt/packet_list.cpp                              |   2 +-
 ui/qt/proto_tree.cpp                               |   2 +-
 ui/qt/uat_dialog.cpp                               |   2 +-
 ui/qt/uat_frame.cpp                                |   2 +-
 51 files changed, 448 insertions(+), 442 deletions(-)