aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pgsql.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-09-13 08:40:27 -0700
committerGerald Combs <gerald@wireshark.org>2018-09-13 22:37:52 +0000
commitcd95e197ca78feb1e83ec737b87ada0a1dd57d10 (patch)
tree7d54d8cc9b6170acff8ca618b6d0eb5fa439f4f6 /epan/dissectors/packet-pgsql.c
parent63743a3733441a4f54ca6216ad63654bb3012824 (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-pgsql.c')
-rw-r--r--epan/dissectors/packet-pgsql.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 849abd6e15..fc5638bcf0 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -21,7 +21,7 @@ void proto_register_pgsql(void);
void proto_reg_handoff_pgsql(void);
static dissector_handle_t pgsql_handle;
-static dissector_handle_t ssl_handle;
+static dissector_handle_t tls_handle;
static int proto_pgsql = -1;
static int hf_frontend = -1;
@@ -657,7 +657,7 @@ dissect_pgsql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
switch (tvb_get_guint8(tvb, 0)) {
case 'S': /* Willing to perform SSL */
/* Next packet will start using SSL. */
- ssl_starttls_ack(ssl_handle, pinfo, pgsql_handle);
+ ssl_starttls_ack(tls_handle, pinfo, pgsql_handle);
break;
case 'N': /* Unwilling to perform SSL */
default: /* ErrorMessage when server does not support SSL. */
@@ -891,7 +891,7 @@ proto_reg_handoff_pgsql(void)
dissector_add_uint_with_preference("tcp.port", PGSQL_PORT, pgsql_handle);
- ssl_handle = find_dissector_add_dependency("ssl", proto_pgsql);
+ tls_handle = find_dissector_add_dependency("tls", proto_pgsql);
}
/*