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-mysql.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-mysql.c')
| -rw-r--r-- | epan/dissectors/packet-mysql.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 3f99689686..cee1323ef9 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -640,7 +640,7 @@ static int hf_mysql_compressed_packet_length_uncompressed = -1; static int hf_mysql_compressed_packet_number = -1; static dissector_handle_t mysql_handle; -static dissector_handle_t ssl_handle; +static dissector_handle_t tls_handle; static expert_field ei_mysql_eof = EI_INIT; static expert_field ei_mysql_dissector_incomplete = EI_INIT; @@ -1042,7 +1042,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, { col_set_str(pinfo->cinfo, COL_INFO, "Response: SSL Handshake"); conn_data->frame_start_ssl = pinfo->num; - ssl_starttls_ack(ssl_handle, pinfo, mysql_handle); + ssl_starttls_ack(tls_handle, pinfo, mysql_handle); } if (conn_data->clnt_caps & MYSQL_CAPS_CU) /* 4.1 protocol */ { @@ -2334,7 +2334,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat } #endif - is_ssl = proto_is_frame_protocol(pinfo->layers, "ssl"); + is_ssl = proto_is_frame_protocol(pinfo->layers, "tls"); if (is_response) { if (packet_number == 0 && mysql_frame_data_p->state == UNDEFINED) { @@ -3322,7 +3322,7 @@ void proto_register_mysql(void) /* dissector registration */ void proto_reg_handoff_mysql(void) { - ssl_handle = find_dissector("ssl"); + tls_handle = find_dissector("tls"); dissector_add_uint_with_preference("tcp.port", TCP_PORT_MySQL, mysql_handle); } |