From 391f0979475f0c7485f7ea3d09ca62c6f7287145 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Thu, 11 May 2023 01:34:59 -0400 Subject: [PATCH] lighttpd: select mbedtls for default cryptolib wolfssl has been the base TLS library in openwrt since 21.02 mbedtls will once again be the base TLS library in openwrt 23.?? Default to mbedtls for digest functions in lighttpd Signed-off-by: Glenn Strauss --- net/lighttpd/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 7954afb8a4..db2040e236 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -60,7 +60,7 @@ PKG_BUILD_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/meson.mk -# choose crypto lib for lighttpd to use for crypto algorithms (default: nettle) +# choose crypto lib for lighttpd to use for crypto algorithms # (separate from lighttpd TLS modules, which are each standalone) cryptolibdep= \ +LIGHTTPD_CRYPTOLIB_NETTLE:libnettle \ @@ -69,8 +69,6 @@ cryptolibdep= \ ifdef CONFIG_LIGHTTPD_CRYPTOLIB_MBEDTLS TARGET_CPPFLAGS += -DFORCE_MBEDTLS_CRYPTO else ifdef CONFIG_LIGHTTPD_CRYPTOLIB_WOLFSSL - # (Note: if CONFIG_LIGHTTPD_CRYPTOLIB_WOLFSSL is set, - # then lighttpd-mod-mbedtls should not be selected to also be built) TARGET_CPPFLAGS += -DFORCE_WOLFSSL_CRYPTO endif @@ -123,7 +121,7 @@ config LIGHTTPD_PCRE2 if PACKAGE_lighttpd choice prompt "crypto library" - default LIGHTTPD_CRYPTOLIB_WOLFSSL + default LIGHTTPD_CRYPTOLIB_MBEDTLS help library to use for cryptographic algorithms