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>
This commit is contained in:
parent
8e594bb457
commit
50dbe4df7f
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#endif
|
||||
|
||||
#include "packet-tcp.h"
|
||||
#include "packet-ssl.h"
|
||||
#include "packet-tls.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <math.h>
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <epan/packet.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include "packet-ssl.h"
|
||||
#include "packet-tls.h"
|
||||
#include "packet-thrift.h"
|
||||
|
||||
|
||||
|
|
|
@ -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.
|
|
@ -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
|
|
@ -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,
|
|
@ -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__ */
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -114,7 +114,7 @@ includes_to_keep.append('packet-atalk.h')
|
|||
includes_to_keep.append('packet-ppp.h')
|
||||
includes_to_keep.append('packet-scsi-mmc.h')
|
||||
includes_to_keep.append('packet-t30.h')
|
||||
includes_to_keep.append('packet-ssl.h')
|
||||
includes_to_keep.append('packet-tls.h')
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ HEADER = "/* Generated by tools/make-tls-ct-logids.py\n"
|
|||
# See also https://www.certificate-transparency.org/known-logs
|
||||
CT_JSON_URL = 'https://www.certificate-transparency.org/known-logs/all_logs_list.json'
|
||||
# File to be patched
|
||||
SOURCE_FILE = "epan/dissectors/packet-ssl-utils.c"
|
||||
SOURCE_FILE = "epan/dissectors/packet-tls-utils.c"
|
||||
|
||||
def escape_c(s):
|
||||
return s.replace('\\', '\\\\').replace('"', '\\"')
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include <epan/address.h>
|
||||
#include <epan/dissectors/packet-ssl.h>
|
||||
#include <epan/dissectors/packet-ssl-utils.h>
|
||||
#include <epan/dissectors/packet-tls.h>
|
||||
#include <epan/dissectors/packet-tls-utils.h>
|
||||
|
||||
#include "ui/ssl_key_export.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue