From cb62dfd24945f5732166ecb4121354adc48cec80 Mon Sep 17 00:00:00 2001
From: Toni <matzeton@googlemail.com>
Date: Wed, 2 Mar 2022 19:48:46 +0100
Subject: Drop support for non-gcrypt builds. (#1469)
* As there is now a builtin, lightweight libgcrypt
there is no need to disable tls-clho decryption.
* It is still possible to use a host libgcrypt
with `--with-local-libgcrypt'.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
src/lib/third_party/include/gcrypt_light.h | 2 --
src/lib/third_party/src/gcrypt_light.c | 4 ----
2 files changed, 6 deletions(-)
(limited to 'src/lib/third_party')
diff --git a/src/lib/third_party/include/gcrypt_light.h b/src/lib/third_party/include/gcrypt_light.h
index 7f31f24a0..6d6a115ee 100644
--- a/src/lib/third_party/include/gcrypt_light.h
+++ b/src/lib/third_party/include/gcrypt_light.h
@@ -2,8 +2,6 @@
#ifndef GCRY_LIGHT_H
#define GCRY_LIGHT_H
-#define LIBGCRYPT_INTERNAL
-
#define HMAC_SHA256_DIGEST_SIZE 32 /* Same as SHA-256's output size. */
#define SHA256_DIGEST_SIZE 32
#define GCRY_MD_BUFF_SIZE 256
diff --git a/src/lib/third_party/src/gcrypt_light.c b/src/lib/third_party/src/gcrypt_light.c
index ecd4b6fc4..c048e8704 100644
--- a/src/lib/third_party/src/gcrypt_light.c
+++ b/src/lib/third_party/src/gcrypt_light.c
@@ -8,8 +8,6 @@
#include "ndpi_api.h"
-#if !defined(HAVE_LIBGCRYPT)
-
#if defined(__GNUC__) && \
( defined(__amd64__) || defined(__x86_64__) ) && \
! defined(MBEDTLS_HAVE_X86_64)
@@ -372,6 +370,4 @@ gcry_error_t gcry_cipher_decrypt (gcry_cipher_hd_t h,
return _gcry_cipher_crypt(h,out,outsize,in,inlen,0);
}
-#endif /* HAVE_LIBGCRYPT */
-
/* vim: set ts=4 sw=4 et: */
--
cgit v1.2.3