diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-02-21 11:22:18 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-02-21 13:39:57 +0000 |
| commit | acb6781012409b391592096127460fcfd9b648d7 (patch) | |
| tree | 3c5b8717b9f72d4f3aed37373db08515f66d7b50 /epan/dissectors/packet-ssl-utils.h | |
| parent | 62d34fcc2cecf560b0b8f3c897cb3f0f8df31b99 (diff) | |
TLS: allow QUIC dissector to pass HKDF label for ciphers
To support decryption of future drafts of QUIC, the HKDF label must be
configurable by the QUIC dissector. Currently it can only select between
"tls13 " and "TLS 1.3, " which is not sufficient (it needs "QUIC ").
Change "tls13_hkdf_expand_label" and "tls13_cipher_create" to accept the
label prefix directly instead of just a TLS 1.3 draft version number.
Change-Id: I466a6e1a8f4b051f5775e7d8d6658641a1ae7fb1
Reviewed-on: https://code.wireshark.org/review/25961
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 536c4c9fc0..a441862b04 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -632,7 +632,7 @@ ssl_decrypt_record(SslDecryptSession *ssl, SslDecoder *decoder, guint8 ct, guint * and mode are Libgcrypt identifiers. */ tls13_cipher * -tls13_cipher_create(guint8 tls13_draft_version, int cipher_algo, int cipher_mode, int hash_algo, const StringInfo *secret, const gchar **error); +tls13_cipher_create(const char *label_prefix, int cipher_algo, int cipher_mode, int hash_algo, const StringInfo *secret, const gchar **error); /* Common part bitween SSL and DTLS dissectors */ @@ -1073,9 +1073,9 @@ tls_dissect_sct_list(ssl_common_dissect_t *hf, tvbuff_t *tvb, packet_info *pinfo guint32 offset, guint32 offset_end, guint16 version); extern gboolean -tls13_hkdf_expand_label_common(int md, const StringInfo *secret, - const char *label_prefix, const char *label, - guint16 out_len, guchar **out); +tls13_hkdf_expand_label(int md, const StringInfo *secret, + const char *label_prefix, const char *label, + guint16 out_len, guchar **out); /* {{{ */ #define SSL_COMMON_LIST_T(name) \ |