From cb62dfd24945f5732166ecb4121354adc48cec80 Mon Sep 17 00:00:00 2001 From: Toni 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 --- packages/openwrt/Makefile | 9 +++++---- packages/openwrt/Makefile.dev | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/openwrt/Makefile b/packages/openwrt/Makefile index e24b5d5ed..4b9c77963 100644 --- a/packages/openwrt/Makefile +++ b/packages/openwrt/Makefile @@ -28,8 +28,8 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_LIBNDPI_GCRYPT),) -CONFIGURE_ARGS += --disable-gcrypt +ifneq ($(CONFIG_LIBNDPI_GCRYPT),) +CONFIGURE_ARGS += --with-local-libgcrypt endif define Package/libndpi @@ -47,11 +47,12 @@ endef define Package/libndpi/config config LIBNDPI_GCRYPT - bool "GCrypt support" + bool "Use external libgcrypt" depends on PACKAGE_libndpi default n help - This option enables QUIC client hello decryption. + This option enables QUIC client hello decryption through + an external libgcrypt instead of a lightweight builtin version. Disabled by default. endef diff --git a/packages/openwrt/Makefile.dev b/packages/openwrt/Makefile.dev index 5f11eceea..d174475eb 100644 --- a/packages/openwrt/Makefile.dev +++ b/packages/openwrt/Makefile.dev @@ -27,8 +27,8 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_LIBNDPI_GCRYPT),) -CONFIGURE_ARGS += --disable-gcrypt +ifneq ($(CONFIG_LIBNDPI_GCRYPT),) +CONFIGURE_ARGS += --with-local-libgcrypt endif define Package/libndpi @@ -46,11 +46,12 @@ endef define Package/libndpi/config config LIBNDPI_GCRYPT - bool "GCrypt support" + bool "Use external libgcrypt" depends on PACKAGE_libndpi default n help - This option enables QUIC client hello decryption. + This option enables QUIC client hello decryption through + an external libgcrypt instead of a lightweight builtin version. Disabled by default. endef -- cgit v1.2.3