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-couchbase.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-couchbase.c')
-rw-r--r-- | epan/dissectors/packet-couchbase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index 836e2ab873..ca2673d7dc 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -2584,8 +2584,8 @@ proto_register_couchbase(void) " to reassemble TCP streams\" in the TCP protocol settings.", &couchbase_desegment_body); - prefs_register_uint_preference(couchbase_module, "ssl_port", "SSL/TLS Data Port", - "The port used for communicating with the data service via ssl/tls", + prefs_register_uint_preference(couchbase_module, "tls_port", "SSL/TLS Data Port", + "The port used for communicating with the data service via SSL/TLS", 10, &couchbase_ssl_port_pref); |