Rename packet-ssl* to packet-tls*

Rename packet-ssl{,-utils}.[ch] to packet-tls{,-utils}.[ch].

Change-Id: I4732162ec131ddf0734b3dd191ccc9e48a76ce06
Reviewed-on: https://code.wireshark.org/review/29659
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

43 files changed, 73 insertions, 73 deletions

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index f0dc0fb39f..db4cf8a8ad 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -542,8 +542,6 @@ set(DISSECTOR_PUBLIC_HEADERS
 	packet-spice.h
 	packet-sprt.h
 	packet-sscop.h
-	packet-ssl.h
-	packet-ssl-utils.h
 	packet-stat.h
 	packet-stat-notify.h
 	packet-sv.h
@@ -555,6 +553,8 @@ set(DISSECTOR_PUBLIC_HEADERS
 	packet-tcap.h
 	packet-tcp.h
 	packet-tetra.h
+	packet-tls-utils.h
+	packet-tls.h
 	packet-tn3270.h
 	packet-tn5250.h
 	packet-tpkt.h
@@ -1686,8 +1686,6 @@ set(DISSECTOR_SRC
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-sscf-nni.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-sscop.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-ssh.c
-	${CMAKE_CURRENT_SOURCE_DIR}/packet-ssl-utils.c
-	${CMAKE_CURRENT_SOURCE_DIR}/packet-ssl.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-sstp.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-stanag4607.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-starteam.c
@@ -1730,6 +1728,8 @@ set(DISSECTOR_SRC
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-time.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tipc.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tivoconnect.c
+	${CMAKE_CURRENT_SOURCE_DIR}/packet-tls-utils.c
+	${CMAKE_CURRENT_SOURCE_DIR}/packet-tls.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tn3270.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tn5250.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tnef.c
diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c
index 38ee412f21..e0158a1716 100644
--- a/epan/dissectors/asn1/h225/packet-h225-template.c
+++ b/epan/dissectors/asn1/h225/packet-h225-template.c
@@ -40,7 +40,7 @@
 #include "packet-h245.h"
 #include "packet-h323.h"
 #include "packet-q931.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 #define PNAME  "H323-MESSAGES"
 #define PSNAME "H.225.0"
diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c
index b86be9913e..8700d82681 100644
--- a/epan/dissectors/asn1/ldap/packet-ldap-template.c
+++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c
@@ -90,8 +90,8 @@
 
 #include "packet-ldap.h"
 #include "packet-ntlmssp.h"
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 #include "packet-smb-common.h"
 #include "packet-gssapi.h"
 
diff --git a/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c b/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c
index 5989454229..5260a74cd7 100644
--- a/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c
+++ b/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c
@@ -23,7 +23,7 @@
 #include "packet-x509if.h"
 #include "packet-x509ce.h"
 
-/* from packet-ssl-utils.h */
+/* from packet-tls-utils.h */
 extern const value_string tls_hello_extension_types[];
 
 #define PNAME  "PKIX1Explicit"
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 60dd3a396a..699dc0c0bc 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -19,7 +19,7 @@
 #include <epan/to_str.h>
 
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 0fc075c06b..23376f7f52 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -36,7 +36,7 @@
 #include <epan/proto_data.h>
 #include <wsutil/str_util.h>
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 
 void proto_register_amqp(void);
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c
index 66c9c95c47..f33ff8eb1e 100644
--- a/epan/dissectors/packet-couchbase.c
+++ b/epan/dissectors/packet-couchbase.c
@@ -40,7 +40,7 @@
 #endif
 
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 #include <glib.h>
 #include <math.h>
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index b1e0a1e179..9a17ebf87c 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -33,7 +33,7 @@
 #include <epan/afn.h>
 #include <epan/tap.h>
 #include <epan/stats_tree.h>
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-dtls.h"
 
 void proto_register_dns(void);
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 9a9f08f762..363a301103 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -15,9 +15,9 @@
  * See RFC 4347 for details about DTLS specs.
  *
  * Notes :
- * This dissector is based on the TLS dissector (packet-ssl.c); Because of the similarity
+ * This dissector is based on the TLS dissector (packet-tls.c); Because of the similarity
  *   of DTLS and TLS, decryption works like TLS with RSA key exchange.
- * This dissector uses the sames things (file, libraries) as the TLS dissector (gnutls, packet-ssl-utils.h)
+ * This dissector uses the sames things (file, libraries) as the TLS dissector (gnutls, packet-tls-utils.h)
  *  to make it easily maintainable.
  *
  * It was developed to dissect and decrypt the OpenSSL v 0.9.8f DTLS implementation.
@@ -30,7 +30,7 @@
  * Todo :
  *  - activate correct Mac calculation when openssl will be corrected
  *    (or if an other implementation works),
- *    corrected code is ready and commented in packet-ssl-utils.h file.
+ *    corrected code is ready and commented in packet-tls-utils.h file.
  *  - add missing things (desegmentation, reordering... that aren't present in actual OpenSSL implementation)
  */
 
@@ -50,7 +50,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/utf8_entities.h>
 #include <wsutil/rsa.h>
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 #include "packet-dtls.h"
 
 void proto_register_dtls(void);
diff --git a/epan/dissectors/packet-dtls.h b/epan/dissectors/packet-dtls.h
index 5d57c5d9f5..8e07a3bbba 100644
--- a/epan/dissectors/packet-dtls.h
+++ b/epan/dissectors/packet-dtls.h
@@ -18,7 +18,7 @@ WS_DLL_PUBLIC void dtls_dissector_add(guint port, dissector_handle_t handle);
 WS_DLL_PUBLIC void dtls_dissector_delete(guint port, dissector_handle_t handle);
 
 
-/* Shared with packet-ssl-utils.c */
+/* Shared with packet-tls-utils.c */
 
 gint
 dtls_dissect_hnd_hello_ext_use_srtp(tvbuff_t *tvb, proto_tree *tree,
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 4bba60ca7e..deb4c6fd4b 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -40,8 +40,8 @@
 #include "packet-enip.h"
 #include "packet-cipsafety.h"
 #include "packet-dtls.h"
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 
 void proto_register_enip(void);
 void proto_reg_handoff_enip(void);
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 7b56b0c5ff..d810e89567 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -24,7 +24,7 @@
 #include <wsutil/strtoi.h>
 
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 void proto_register_fix(void);
 void proto_reg_handoff_fix(void);
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 2a724c7228..2c20b93263 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -48,7 +48,7 @@
 #include "packet-h245.h"
 #include "packet-h323.h"
 #include "packet-q931.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 #define PNAME  "H323-MESSAGES"
 #define PSNAME "H.225.0"
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 0f7fccd24c..83b88a85bc 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -36,7 +36,7 @@
 
 #include "packet-http.h"
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 void proto_register_http(void);
 void proto_reg_handoff_http(void);
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index e037d7dc7a..1a161dd7d0 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -16,8 +16,8 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 
 void proto_register_imap(void);
 void proto_reg_handoff_imap(void);
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 6734b1fb0f..8d6ac0d5bc 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -98,8 +98,8 @@
 
 #include "packet-ldap.h"
 #include "packet-ntlmssp.h"
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 #include "packet-smb-common.h"
 #include "packet-gssapi.h"
 
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index ca9095eed2..b032d99488 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -23,7 +23,7 @@
 #include <epan/exceptions.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #ifdef HAVE_SNAPPY
 #include <snappy-c.h>
 #endif
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 78f6abd9d1..f400e82324 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -72,7 +72,7 @@
 
 #include "packet-windows-common.h"
 #include "packet-tcp.h"
-#include <packet-ssl.h>
+#include <packet-tls.h>
 
 #include "packet-mq.h"
 
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c
index 137cdb322b..476d91435f 100644
--- a/epan/dissectors/packet-mqtt.c
+++ b/epan/dissectors/packet-mqtt.c
@@ -37,7 +37,7 @@
 #include <epan/strutil.h>
 #include <epan/uat.h>
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 #define MQTT_DEFAULT_PORT     1883 /* IANA registered under service name as mqtt */
 #define MQTT_SSL_DEFAULT_PORT 8883 /* IANA registered under service name secure-mqtt */
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index cee1323ef9..0decf910ab 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -30,7 +30,7 @@
 #include <epan/strutil.h>
 #include <epan/proto_data.h>
 #include "packet-tcp.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 
 void proto_register_mysql(void);
 void proto_reg_handoff_mysql(void);
diff --git a/epan/dissectors/packet-opa-fe.c b/epan/dissectors/packet-opa-fe.c
index 10c1cb131e..2266167e54 100644
--- a/epan/dissectors/packet-opa-fe.c
+++ b/epan/dissectors/packet-opa-fe.c
@@ -14,7 +14,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-tcp.h"
 
 void proto_reg_handoff_opa_fe(void);
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c
index 41fc83afc3..e843db61a1 100644
--- a/epan/dissectors/packet-pcp.c
+++ b/epan/dissectors/packet-pcp.c
@@ -14,7 +14,7 @@
 #include <epan/expert.h>
 #include <glib.h>
 #include "packet-tcp.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 
 void proto_register_pcp(void);
 void proto_reg_handoff_pcp(void);
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index fc5638bcf0..54d06b5e69 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -14,7 +14,7 @@
 
 #include <epan/packet.h>
 
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 #include "packet-tcp.h"
 
 void proto_register_pgsql(void);
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 241c354310..af6b105eb9 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -31,7 +31,7 @@
 #include "packet-x509if.h"
 #include "packet-x509ce.h"
 
-/* from packet-ssl-utils.h */
+/* from packet-tls-utils.h */
 extern const value_string tls_hello_extension_types[];
 
 #define PNAME  "PKIX1Explicit"
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index b9845204cd..cf29ac4d43 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -27,8 +27,8 @@
 #include <wsutil/str_util.h>
 #include <wsutil/strtoi.h>
 
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 
 void proto_register_pop(void);
 void proto_reg_handoff_pop(void);
diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c
index e73375935f..6013187dc7 100644
--- a/epan/dissectors/packet-quic.c
+++ b/epan/dissectors/packet-quic.c
@@ -23,8 +23,8 @@
 #include <epan/expert.h>
 #include <epan/proto_data.h>
 #include <epan/to_str.h>
-#include "packet-ssl-utils.h"
-#include "packet-ssl.h"
+#include "packet-tls-utils.h"
+#include "packet-tls.h"
 #include <epan/prefs.h>
 #include <wsutil/pint.h>
 
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c
index 9a40384a35..4a0fea1f4f 100644
--- a/epan/dissectors/packet-rdp.c
+++ b/epan/dissectors/packet-rdp.c
@@ -21,7 +21,7 @@
 #include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-t124.h"
 
 #define PNAME  "Remote Desktop Protocol"
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 8145411a8a..091006a3b8 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -27,7 +27,7 @@
 #include <epan/uat.h>
 #include <epan/to_str.h>
 #include "packet-x509af.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 #include "packet-reload.h"
 
 void proto_register_reload(void);
diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c
index dd343d5b25..f30ebbd7fd 100644
--- a/epan/dissectors/packet-rpki-rtr.c
+++ b/epan/dissectors/packet-rpki-rtr.c
@@ -17,7 +17,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include <epan/expert.h>
 #include <epan/asn1.h>
 #include "packet-x509af.h"
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 3a89875320..d4b0cdfef5 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -39,7 +39,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/wsgcrypt.h>
 
-#include "packet-ssl.h"
+#include "packet-tls.h"
 
 #include "packet-isup.h"
 #include "packet-e164.h"
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index bb34d15600..b57d73acbb 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -44,7 +44,7 @@
 
 #include "packet-rtp.h"
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-skinny.h"
 
 /* un-comment the following as well as this line in conversation.c, to enable debug printing */
diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in
index 47c24989b1..0fc8e7afc4 100644
--- a/epan/dissectors/packet-skinny.c.in
+++ b/epan/dissectors/packet-skinny.c.in
@@ -56,7 +56,7 @@ cog.out(' */\n')
 
 #include "packet-rtp.h"
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-skinny.h"
 
 /* un-comment the following as well as this line in conversation.c, to enable debug printing */
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 7e6201d2ac..c45f67cc84 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -25,8 +25,8 @@
 #include <epan/proto_data.h>
 
 #include <wsutil/str_util.h>
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 
 /* RFC 2821 */
 #define TCP_PORT_SMTP      "25"
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c
index 5ac81aa0b9..885bdcdb3e 100644
--- a/epan/dissectors/packet-spdy.c
+++ b/epan/dissectors/packet-spdy.c
@@ -27,7 +27,7 @@
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include "packet-tcp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-http.h"
 
 #ifdef HAVE_ZLIB
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 39805762f0..4f80b85ee2 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -19,7 +19,7 @@
 #include <epan/expert.h>
 #include <epan/asn1.h>
 #include "packet-kerberos.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 #include "packet-tn3270.h"
 #include "packet-tn5250.h"
 
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index ccc5df0224..5ff3f24523 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -20,7 +20,7 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-thrift.h"
 
 
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-tls-utils.c
index 80a7309020..931f84a4e7 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-tls-utils.c
@@ -1,4 +1,4 @@
-/* packet-ssl-utils.c
+/* packet-tls-utils.c
  * ssl manipulation functions
  * By Paolo Abeni <paolo.abeni@email.com>
  *
@@ -43,9 +43,9 @@
 #include "packet-ber.h"
 #include "packet-x509af.h"
 #include "packet-x509if.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 #include "packet-ocsp.h"
-#include "packet-ssl.h"
+#include "packet-tls.h"
 #include "packet-dtls.h"
 #if defined(HAVE_LIBGNUTLS)
 #include <gnutls/abstract.h>
@@ -1371,7 +1371,7 @@ const value_string quic_tp_preferred_address_vals[] = {
 
 /* Lookup tables }}} */
 
-/* we keep this internal to packet-ssl-utils, as there should be
+/* we keep this internal to packet-tls-utils, as there should be
    no need to access it any other way.
 
    This also allows us to hide the dependency on zlib.
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-tls-utils.h
index a14a2e8a12..d5b2ca717d 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-tls-utils.h
@@ -1,4 +1,4 @@
-/* packet-ssl-utils.h
+/* packet-tls-utils.h
  * ssl manipulation functions
  * By Paolo Abeni <paolo.abeni@email.com>
  *
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __SSL_UTILS_H_
-#define __SSL_UTILS_H_
+#ifndef __PACKET_TLS_UTILS_H__
+#define __PACKET_TLS_UTILS_H__
 
 #include <stdio.h>      /* some APIs we declare take a stdio stream as an argument */
 
@@ -334,7 +334,7 @@ typedef struct {
 #define KEX_TLS13       0x23
 #define KEX_ECJPAKE     0x24
 
-/* Order is significant, must match "ciphers" array in packet-ssl-utils.c */
+/* Order is significant, must match "ciphers" array in packet-tls-utils.c */
 #define ENC_DES         0x30
 #define ENC_3DES        0x31
 #define ENC_RC4         0x32
@@ -931,12 +931,12 @@ typedef struct {
     /* Do not forget to initialize dtls_hfs to -1 in packet-dtls.c! */
 } dtls_hfs_t;
 
-/* Header fields specific to SSL. See packet-ssl.c */
+/* Header fields specific to SSL. See packet-tls.c */
 typedef struct {
     gint hs_md5_hash;
     gint hs_sha_hash;
 
-    /* Do not forget to initialize ssl_hfs to -1 in packet-ssl.c! */
+    /* Do not forget to initialize ssl_hfs to -1 in packet-tls.c! */
 } ssl_hfs_t;
 
 
@@ -2076,7 +2076,7 @@ ssl_debug_printf(const gchar* fmt _U_,...)
 
 #endif /* SSL_DECRYPT_DEBUG */
 
-#endif /* SSL_UTILS_H */
+#endif /* __PACKET_TLS_UTILS_H__ */
 
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-tls.c
index d9acf6315d..81abc9586f 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-tls.c
@@ -1,4 +1,4 @@
-/* packet-ssl.c
+/* packet-tls.c
  * Routines for TLS dissection
  * Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
  *
@@ -82,8 +82,8 @@
 #include <wsutil/rsa.h>
 #include "packet-tcp.h"
 #include "packet-x509af.h"
-#include "packet-ssl.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls.h"
+#include "packet-tls-utils.h"
 #include "packet-ber.h"
 #if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
 /* Whether to provide support for authentication in addition to decryption. */
@@ -852,7 +852,7 @@ is_sslv3_or_tls(tvbuff_t *tvb)
         return FALSE;
     }
 
-    /* Check for sane length, see also ssl_check_record_length in packet-ssl-utils.c */
+    /* Check for sane length, see also ssl_check_record_length in packet-tls-utils.c */
     if (record_length == 0 || record_length >= TLS_MAX_RECORD_LENGTH + 2048) {
         return FALSE;
     }
@@ -3384,7 +3384,7 @@ tls_get_cipher_info(packet_info *pinfo, int *cipher_algo, int *cipher_mode, int
         return FALSE;
     }
 
-    /* adapted from ssl_cipher_init in packet-ssl-utils.c */
+    /* adapted from ssl_cipher_init in packet-tls-utils.c */
     static const gint gcry_modes[] = {
         GCRY_CIPHER_MODE_STREAM,
         GCRY_CIPHER_MODE_CBC,
diff --git a/epan/dissectors/packet-ssl.h b/epan/dissectors/packet-tls.h
index 534682ce66..d54f7ae749 100644
--- a/epan/dissectors/packet-ssl.h
+++ b/epan/dissectors/packet-tls.h
@@ -1,4 +1,4 @@
-/* packet-ssl.h
+/* packet-tls.h
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __PACKET_SSL_H__
-#define __PACKET_SSL_H__
+#ifndef __PACKET_TLS_H__
+#define __PACKET_TLS_H__
 
 #include "ws_symbol_export.h"
 #include <epan/packet.h>
@@ -46,4 +46,4 @@ tls13_exporter(packet_info *pinfo, gboolean is_early,
 gboolean
 tls13_get_quic_secret(packet_info *pinfo, gboolean is_from_server, int type, guint secret_len, guint8 *secret_out);
 
-#endif  /* __PACKET_SSL_H__ */
+#endif  /* __PACKET_TLS_H__ */
diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c
index fc6a56a07e..6ccdd1b2ef 100644
--- a/epan/dissectors/packet-wireguard.c
+++ b/epan/dissectors/packet-wireguard.c
@@ -617,7 +617,7 @@ wg_psk_iter_next(wg_psk_iter_context *psk_iter, const wg_handshake_state_t *hs,
 /* PSK handling. }}} */
 
 /* UAT and key configuration. {{{ */
-/* XXX this is copied verbatim from packet-ssl-utils.c - create new common API
+/* XXX this is copied verbatim from packet-tls-utils.c - create new common API
  * for retrieval of runtime secrets? */
 static gboolean
 file_needs_reopen(FILE *fp, const char *filename)
diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c
index add7392f99..af5c5bd04f 100644
--- a/epan/dissectors/packet-xmpp-core.c
+++ b/epan/dissectors/packet-xmpp-core.c
@@ -21,7 +21,7 @@
 #include "packet-xmpp-other.h"
 #include "packet-xmpp-gtalk.h"
 #include "packet-xmpp-conference.h"
-#include "packet-ssl-utils.h"
+#include "packet-tls-utils.h"
 
 tvbparse_wanted_t *want_ignore;
 tvbparse_wanted_t *want_stream_end_tag;
diff --git a/epan/wslua/taps b/epan/wslua/taps
index 8c280a2df0..11b1132171 100644
--- a/epan/wslua/taps
+++ b/epan/wslua/taps
@@ -1,5 +1,5 @@
 # taps
-# instructions for make-taps.pl to generate the taps.c file 
+# instructions for make-taps.pl to generate the taps.c file
 #
 # (c) 2006 Luis E. Garcia Ontanon <luis@ontanon.org>
 #
@@ -56,10 +56,10 @@ ldap ../dissectors/packet-ldap.h ldap_call_response_t
 #sip ../dissectors/packet-sip.h sip_info_t
 smb ../dissectors/packet-smb.h smb_info_t
 smb2 ../dissectors/packet-smb2.h smb2_info_t
-#ssl ../dissectors/packet-ssl.h ssl_info_t
 #t38 ../dissectors/packet-t38.h t38_info_t
 tcp ../dissectors/packet-tcp.h tcp_info_t
 #teredo ../dissectors/packet-teredo.h teredo_info_t
+#tls ../dissectors/packet-tls.h ssl_info_t
 #tr ../dissectors/packet-tr.h tr_info_t
 wlan ../dissectors/packet-ieee80211.h wlan_hdr_t
 #wsp ../dissectors/packet-wsp.h wsp_info_t