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/asn1 | |
| 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/asn1')
| -rw-r--r-- | epan/dissectors/asn1/credssp/packet-credssp-template.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ldap/ldap.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ldap/packet-ldap-template.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/asn1/credssp/packet-credssp-template.c b/epan/dissectors/asn1/credssp/packet-credssp-template.c index 020800583a..aef949af62 100644 --- a/epan/dissectors/asn1/credssp/packet-credssp-template.c +++ b/epan/dissectors/asn1/credssp/packet-credssp-template.c @@ -158,7 +158,7 @@ void proto_register_credssp(void) { /*--- proto_reg_handoff_credssp --- */ void proto_reg_handoff_credssp(void) { - heur_dissector_add("ssl", dissect_credssp_heur, "CredSSP over SSL", "credssp_ssl", proto_credssp, HEURISTIC_ENABLE); + heur_dissector_add("tls", dissect_credssp_heur, "CredSSP over TLS", "credssp_tls", proto_credssp, HEURISTIC_ENABLE); exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LAYER_7); } diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf index 2e9c94d100..624c311208 100644 --- a/epan/dissectors/asn1/ldap/ldap.cnf +++ b/epan/dissectors/asn1/ldap/ldap.cnf @@ -441,7 +441,7 @@ ldap_conv_info_t *ldap_info; if (ldap_info && ldap_info->start_tls_pending && hf_index == hf_ldap_extendedResponse_resultCode && resultCode == 0) { /* The conversation will continue using SSL */ - ssl_starttls_ack(find_dissector("ssl"), actx->pinfo, ldap_handle); + ssl_starttls_ack(find_dissector("tls"), actx->pinfo, ldap_handle); ldap_info->start_tls_pending = FALSE; } diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 9b9b9afdcf..b86be9913e 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -217,7 +217,7 @@ static dissector_handle_t gssapi_handle; static dissector_handle_t gssapi_wrap_handle; static dissector_handle_t ntlmssp_handle; static dissector_handle_t spnego_handle; -static dissector_handle_t ssl_handle; +static dissector_handle_t tls_handle; static dissector_handle_t ldap_handle ; static void prefs_register_ldap(void); /* forward declaration for use in preferences registration */ @@ -2205,8 +2205,8 @@ void proto_register_ldap(void) { " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ldap_desegment); - prefs_register_uint_preference(ldap_module, "ssl.port", "LDAPS TCP Port", - "Set the port for LDAP operations over SSL", + prefs_register_uint_preference(ldap_module, "tls.port", "LDAPS TCP Port", + "Set the port for LDAP operations over TLS", 10, &global_ldaps_tcp_port); /* UAT */ attributes_uat = uat_new("Custom LDAP AttributeValue types", @@ -2260,7 +2260,7 @@ proto_reg_handoff_ldap(void) ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_ldap); - ssl_handle = find_dissector_add_dependency("ssl", proto_ldap); + tls_handle = find_dissector_add_dependency("tls", proto_ldap); prefs_register_ldap(); |