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-jxta.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-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index f86949f73e..afeeb6fd98 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -65,7 +65,7 @@ static int jxta_tap = -1; static dissector_table_t media_type_dissector_table = NULL; static dissector_handle_t media_handle = NULL; static dissector_handle_t stream_jxta_handle = NULL; -static dissector_handle_t ssl_handle = NULL; +static dissector_handle_t tls_handle = NULL; static int hf_uri_addr = -1; static int hf_uri_src = -1; @@ -2032,9 +2032,9 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf ascii_strdown_inplace(mediatype); if (0 == strcmp("application/x-jxta-tls-block", mediatype)) { - /* If we recognize it as a TLS packet then we shuffle it off to ssl dissector. */ - if (NULL != ssl_handle) { - dissected = call_dissector(ssl_handle, tvb, pinfo, tree); + /* If we recognize it as a TLS packet then we shuffle it off to tls dissector. */ + if (NULL != tls_handle) { + dissected = call_dissector(tls_handle, tvb, pinfo, tree); } } else if (0 == strcmp("application/gzip", mediatype)) { tvbuff_t *uncomp_tvb = tvb_child_uncompress(tvb, tvb, 0, tvb_captured_length(tvb)); @@ -2383,7 +2383,7 @@ void proto_reg_handoff_jxta(void) message_jxta_handle = create_dissector_handle(dissect_jxta_message, proto_message_jxta); media_type_dissector_table = find_dissector_table("media_type"); - ssl_handle = find_dissector_add_dependency("ssl", proto_jxta); + tls_handle = find_dissector_add_dependency("tls", proto_jxta); media_handle = find_dissector_add_dependency("media", proto_jxta); |