wsutil: define HAVE_LIBGCRYPT_AEAD in wsutil/wsgcrypt.h.
It's used in a number of source files; don't force each of them to test GCRYPT_VERSION_NUMBER independently. Make sure every file that uses HAVE_LIBGCRYPT_AEAD includes wsutil/wsgcrypt.h. Also do some other definitions that are based on the libgcrypt version there as well. This requires that the Qt UI code be given the include directory for libgcrypt, as the follow stream code includes epan/dissectors/packet-quic.h, which includes wsutil/wsgcrypt.h to get HAVE_LIBGCRYPT_AEAD defined, and wsutil/wsgcrypt.h includes <gcrypt.h>. Change-Id: I9cb50f411f5b2b6b9e28a38bfd901f4a66d9cc8f Reviewed-on: https://code.wireshark.org/review/38116 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
This commit is contained in:
parent
151ee60555
commit
d5fe2d494c
|
@ -54,9 +54,6 @@
|
|||
#include <epan/proto_data.h>
|
||||
#include <epan/strutil.h>
|
||||
#include <epan/uat.h>
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010600
|
||||
#define HAVE_LIBGCRYPT_AEAD 1
|
||||
#endif
|
||||
|
||||
void proto_register_isakmp(void);
|
||||
void proto_reg_handoff_isakmp(void);
|
||||
|
|
|
@ -57,15 +57,6 @@
|
|||
#include <epan/follow.h>
|
||||
#include <epan/addr_resolv.h>
|
||||
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
|
||||
/* Whether to provide support for authentication in addition to decryption. */
|
||||
#define HAVE_LIBGCRYPT_AEAD
|
||||
#endif
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010700 /* 1.7.0 */
|
||||
/* Whether ChaCh20 PNE can be supported. */
|
||||
#define HAVE_LIBGCRYPT_CHACHA20
|
||||
#endif
|
||||
|
||||
/* Prototypes */
|
||||
void proto_reg_handoff_quic(void);
|
||||
void proto_register_quic(void);
|
||||
|
|
|
@ -16,6 +16,8 @@ extern "C" {
|
|||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
#include <wsutil/wsgcrypt.h> /* needed to define HAVE_LIBGCRYPT_AEAD */
|
||||
|
||||
/**
|
||||
* Metadata for a STREAM frame.
|
||||
* https://tools.ietf.org/html/draft-ietf-quic-transport-23#section-19.8
|
||||
|
|
|
@ -51,14 +51,6 @@
|
|||
#if defined(HAVE_LIBGNUTLS)
|
||||
#include <gnutls/abstract.h>
|
||||
#endif
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
|
||||
/* Whether to provide support for authentication in addition to decryption. */
|
||||
#define HAVE_LIBGCRYPT_AEAD
|
||||
#endif
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010700 /* 1.7.0 */
|
||||
/* Whether AEAD_CHACHA20_POLY1305 can be supported. */
|
||||
#define HAVE_LIBGCRYPT_CHACHA20_POLY1305
|
||||
#endif
|
||||
|
||||
/* Lookup tables {{{ */
|
||||
const value_string ssl_version_short_names[] = {
|
||||
|
|
|
@ -71,14 +71,6 @@
|
|||
#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. */
|
||||
#define HAVE_LIBGCRYPT_AEAD
|
||||
#endif
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010700 /* 1.7.0 */
|
||||
/* Whether AEAD_CHACHA20_POLY1305 can be supported. */
|
||||
#define HAVE_LIBGCRYPT_CHACHA20_POLY1305
|
||||
#endif
|
||||
|
||||
void proto_register_tls(void);
|
||||
|
||||
|
|
|
@ -9,6 +9,10 @@
|
|||
|
||||
ADD_CUSTOM_CMAKE_INCLUDE()
|
||||
|
||||
include_directories(
|
||||
${GCRYPT_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(WIRESHARK_WIDGET_HEADERS
|
||||
widgets/additional_toolbar.h
|
||||
widgets/apply_line_edit.h
|
||||
|
|
|
@ -25,6 +25,25 @@ DIAG_OFF(deprecated-declarations)
|
|||
|
||||
DIAG_ON(deprecated-declarations)
|
||||
|
||||
/*
|
||||
* Define HAVE_LIBGCRYPT_AEAD here, because it's used in several source
|
||||
* files.
|
||||
*/
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
|
||||
/* Whether to provide support for authentication in addition to decryption. */
|
||||
#define HAVE_LIBGCRYPT_AEAD
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define some other "do we have?" items as well.
|
||||
*/
|
||||
#if GCRYPT_VERSION_NUMBER >= 0x010700 /* 1.7.0 */
|
||||
/* Whether ChaCh20 PNE can be supported. */
|
||||
#define HAVE_LIBGCRYPT_CHACHA20
|
||||
/* Whether AEAD_CHACHA20_POLY1305 can be supported. */
|
||||
#define HAVE_LIBGCRYPT_CHACHA20_POLY1305
|
||||
#endif
|
||||
|
||||
#define HASH_MD5_LENGTH 16
|
||||
#define HASH_SHA1_LENGTH 20
|
||||
#define HASH_SHA2_224_LENGTH 28
|
||||
|
|
Loading…
Reference in New Issue