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-smtp.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-smtp.c')
| -rw-r--r-- | epan/dissectors/packet-smtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 08dc796004..7e6201d2ac 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -104,7 +104,7 @@ static const fragment_items smtp_data_frag_items = { }; static dissector_handle_t smtp_handle; -static dissector_handle_t ssl_handle; +static dissector_handle_t tls_handle; static dissector_handle_t imf_handle; static dissector_handle_t ntlmssp_handle; static dissector_handle_t data_text_lines_handle; @@ -1078,7 +1078,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (session_state->smtp_state == SMTP_STATE_AWAITING_STARTTLS_RESPONSE) { if (code == 220) { /* This is the last non-TLS frame. */ - ssl_starttls_ack(ssl_handle, pinfo, smtp_handle); + ssl_starttls_ack(tls_handle, pinfo, smtp_handle); } session_state->smtp_state = SMTP_STATE_READING_CMDS; } @@ -1343,8 +1343,8 @@ proto_reg_handoff_smtp(void) /* find the IMF dissector */ imf_handle = find_dissector_add_dependency("imf", proto_smtp); - /* find the SSL dissector */ - ssl_handle = find_dissector_add_dependency("ssl", proto_smtp); + /* find the TLS dissector */ + tls_handle = find_dissector_add_dependency("tls", proto_smtp); /* find the NTLM dissector */ ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_smtp); |