diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-02-15 15:23:50 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-02-15 16:19:35 +0000 |
| commit | d45bd7cb2424d4f99924aacf415c92cd7e61329a (patch) | |
| tree | 4b981ec2f06e7d0bc7b909a58744fa5b99fd0588 /epan | |
| parent | 7ae954c7ac934ea5748b6d65f1c04e8c9b90e27f (diff) | |
Move hkdf_extract to wsgcrypt.h
HKDF-Extract is not used in TLS, but in QUIC. For reuse in OSCORE, move
it to wsutil. Adjust comments slightly to emphasize precondition.
Change-Id: I5105e7416037697b383ad58f62be285c2b7ab8b7
Reviewed-on: https://code.wireshark.org/review/25802
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Mališa Vučinić <malishav@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index c5a2ab9add..536c4c9fc0 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -634,17 +634,6 @@ ssl_decrypt_record(SslDecryptSession *ssl, SslDecoder *decoder, guint8 ct, guint tls13_cipher * tls13_cipher_create(guint8 tls13_draft_version, int cipher_algo, int cipher_mode, int hash_algo, const StringInfo *secret, const gchar **error); -/* - * Calculate HKDF-Extract(salt, IKM) -> PRK according to RFC 5869. - * Caller must ensure that 'prk' is large enough to store the digest. - */ -static inline gcry_error_t -hkdf_extract(int algo, const guint8 *salt, size_t salt_len, const guint8 *ikm, size_t ikm_len, guint8 *prk) -{ - /* PRK = HMAC-Hash(salt, IKM) where salt is key, and IKM is input. */ - return ws_hmac_buffer(algo, prk, ikm, ikm_len, salt, salt_len); -} - /* Common part bitween SSL and DTLS dissectors */ /* Hash Functions for RSA private keys table */ |