diff options
| author | John Thacker <johnthacker@gmail.com> | 2022-04-20 21:08:29 -0400 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2022-04-20 21:30:21 -0400 |
| commit | b80cdaa2436bcbc8dd8e0a9c16215f8b879d2620 (patch) | |
| tree | 8d738bdc08998c56c97f06a45920938b88c3663b /epan/dissectors/packet-btmesh-proxy.c | |
| parent | 9c115d0ed5fbb285ff429de628b49e95d8ca7665 (diff) | |
libgcrypt: Require version 1.8.0
Libgcrypt 1.8.x is required for a large amount of decryption
support and is the current LTS version of libgcrypt. The 1.6 and
1.7 series have been end-of-life since 2017-06-30 and 2019-06-30,
respectively.
The Linux distributions that have versions of libgcrypt before 1.8.0
are nearing or at end of support (RHEL7, SLES 12, Debian stretch,
Ubuntu 16.04LTS) and can be supported by the Wireshark 3.6 LTS release
series.
Remove an enormous amount of ifdefs based on libgcrypt versions
1.6.0, 1.7.0, and 1.8.0. There will be a second pass for the
commons defines HAVE_LIBGCRYPT_AEAD, HAVE_LIBGCRYPT_CHACHA20, and
HAVE_LIBGCRYPT_CHACHA20_POLY1305, which are now always defined.
The ISAKMP dissector has some comments noting that some workarounds
were used for libgcrypt 1.6 that aren't needed with 1.7; perhaps
that could be updated now.
Diffstat (limited to 'epan/dissectors/packet-btmesh-proxy.c')
| -rw-r--r-- | epan/dissectors/packet-btmesh-proxy.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/epan/dissectors/packet-btmesh-proxy.c b/epan/dissectors/packet-btmesh-proxy.c index 7d0787ed83..be513caab5 100644 --- a/epan/dissectors/packet-btmesh-proxy.c +++ b/epan/dissectors/packet-btmesh-proxy.c @@ -155,8 +155,6 @@ static guint32 sequence_counter[E_BTMESH_PROXY_SIDE_LAST]; static guint32 fragment_counter[E_BTMESH_PROXY_SIDE_LAST]; static gboolean first_pass; -#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */ - static gint dissect_btmesh_proxy_configuration_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -281,17 +279,6 @@ dissect_btmesh_proxy_configuration_msg(tvbuff_t *tvb, packet_info *pinfo, proto_ return offset; } -#else /* GCRYPT_VERSION_NUMBER >= 0x010600 */ - -static gint -dissect_btmesh_proxy_configuration_msg(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) -{ - proto_tree_add_item(tree, hf_btmesh_proxy_data, tvb, 0, tvb_reported_length(tvb), ENC_NA); - return tvb_reported_length(tvb); -} - -#endif/* GCRYPT_VERSION_NUMBER >= 0x010600 */ - static gint dissect_btmesh_proxy_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *proxy_data) { |