diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-09-13 08:40:27 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-09-13 22:37:52 +0000 |
| commit | cd95e197ca78feb1e83ec737b87ada0a1dd57d10 (patch) | |
| tree | 7d54d8cc9b6170acff8ca618b6d0eb5fa439f4f6 /epan/dissectors/packet-imap.c | |
| parent | 63743a3733441a4f54ca6216ad63654bb3012824 (diff) | |
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@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-imap.c')
| -rw-r--r-- | epan/dissectors/packet-imap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index 1151472a98..e037d7dc7a 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -38,7 +38,7 @@ static gint ett_imap = -1; static gint ett_imap_reqresp = -1; static dissector_handle_t imap_handle; -static dissector_handle_t ssl_handle; +static dissector_handle_t tls_handle; static gboolean imap_ssl_heuristic = TRUE; @@ -133,9 +133,9 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (session_state->ssl_heur_tries_left > 0) { session_state->ssl_heur_tries_left--; if (!check_imap_heur(tvb)) { - ssl_starttls_post_ack(ssl_handle, pinfo, imap_handle); + ssl_starttls_post_ack(tls_handle, pinfo, imap_handle); session_state->ssl_heur_tries_left = 0; - return call_dissector(ssl_handle, tvb, pinfo, tree); + return call_dissector(tls_handle, tvb, pinfo, tree); } } @@ -304,7 +304,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (session_state->ssl_requested) { if (!is_request && strncmp(tokenbuf, "ok", tokenlen) == 0) { /* STARTTLS accepted, next reply will be TLS. */ - ssl_starttls_ack(ssl_handle, pinfo, imap_handle); + ssl_starttls_ack(tls_handle, pinfo, imap_handle); if (session_state->ssl_heur_tries_left > 0) { session_state->ssl_heur_tries_left = 0; } @@ -417,7 +417,7 @@ proto_reg_handoff_imap(void) { dissector_add_uint_with_preference("tcp.port", TCP_PORT_IMAP, imap_handle); ssl_dissector_add(TCP_PORT_SSL_IMAP, imap_handle); - ssl_handle = find_dissector("ssl"); + tls_handle = find_dissector("tls"); } /* * Editor modelines - http://www.wireshark.org/tools/modelines.html |