diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2020-07-13 18:22:57 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-14 11:17:16 +0000 |
| commit | e7642e162f993126ac23c2cfb8df32280c9498c2 (patch) | |
| tree | 532025f7ff7d83711cb373950021a6ceb66d179f /epan/dissectors/packet-tls-utils.c | |
| parent | 90c3e7deadf248b95b7f5528e7d8a7f0299beb3f (diff) | |
TLS: fix build error without LIBGCRYPT_AEAD
Change-Id: I8ece98c312835100949b34bf4777fcdbc0152c8d
Reviewed-on: https://code.wireshark.org/review/37848
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tls-utils.c')
| -rw-r--r-- | epan/dissectors/packet-tls-utils.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c index 1dd7ceda0e..c00deb62bf 100644 --- a/epan/dissectors/packet-tls-utils.c +++ b/epan/dissectors/packet-tls-utils.c @@ -4482,7 +4482,11 @@ tls_decrypt_aead_record(SslDecryptSession *ssl, SslDecoder *decoder, #endif , const guchar *in, guint16 inl, +#ifdef HAVE_LIBGCRYPT_AEAD const guchar *cid, guint8 cidl, +#else + const guchar *cid _U_, guint8 cidl _U_, +#endif StringInfo *out_str, guint *outl) { /* RFC 5246 (TLS 1.2) 6.2.3.3 defines the TLSCipherText.fragment as: @@ -4493,13 +4497,13 @@ tls_decrypt_aead_record(SslDecryptSession *ssl, SslDecoder *decoder, */ const guint16 version = ssl->session.version; const gboolean is_v12 = version == TLSV1DOT2_VERSION || version == DTLSV1DOT2_VERSION; - const gboolean is_cid = ct == SSL_ID_TLS12_CID && version == DTLSV1DOT2_VERSION; gcry_error_t err; const guchar *explicit_nonce = NULL, *ciphertext; guint ciphertext_len, auth_tag_len; guchar nonce[12]; const ssl_cipher_mode_t cipher_mode = decoder->cipher_suite->mode; #ifdef HAVE_LIBGCRYPT_AEAD + const gboolean is_cid = ct == SSL_ID_TLS12_CID && version == DTLSV1DOT2_VERSION; const guint8 draft_version = ssl->session.tls13_draft_version; const guchar *auth_tag_wire; guchar auth_tag_calc[16]; |