Wireshark-commits: [Wireshark-commits] master d5fe2d4: wsutil: define HAVE_LIBGCRYPT_AEAD in wsutil

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 11 Aug 2020 02:30:16 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d5fe2d494c6475263b954a36812b888b11e1a50b
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

d5fe2d4 by Guy Harris (gharris@xxxxxxxxx):

    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@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
    

Actions performed:

    from  151ee60   http3: fix build without support for AEAD cipher suites.
     add  d5fe2d4   wsutil: define HAVE_LIBGCRYPT_AEAD in wsutil/wsgcrypt.h.


Summary of changes:
 epan/dissectors/packet-isakmp.c    |  3 ---
 epan/dissectors/packet-quic.c      |  9 ---------
 epan/dissectors/packet-quic.h      |  2 ++
 epan/dissectors/packet-tls-utils.c |  8 --------
 epan/dissectors/packet-tls.c       |  8 --------
 ui/qt/CMakeLists.txt               |  4 ++++
 wsutil/wsgcrypt.h                  | 19 +++++++++++++++++++
 7 files changed, 25 insertions(+), 28 deletions(-)