From 7549044678087f536c1e0cd76a97734f61ad26af Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Thu, 13 Jun 2024 20:41:01 +0200 Subject: [PATCH] Remove luci-ssl from default packages --- configs/common/dumb_ap | 1 - configs/common/main-router | 1 - configs/common/mbedtls | 2 -- configs/common/nss | 3 --- configs/common/openssl | 10 ++++++++-- configs/common/wolfssl | 9 ++++++++- configs/lantiq/xrx200/tdw8970 | 1 - 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap index a5a4bb4..76aeac7 100644 --- a/configs/common/dumb_ap +++ b/configs/common/dumb_ap @@ -87,7 +87,6 @@ CONFIG_LUCI_LANG_pl=y ####### REPLACE CRYPTOLIB ##### # Remove section and copy from config/common/ a cryptolib section that you need. -CONFIG_PACKAGE_luci-ssl=y CONFIG_PACKAGE_wpad-basic-mbedtls=m CONFIG_PACKAGE_wpad-mbedtls=y ####### diff --git a/configs/common/main-router b/configs/common/main-router index cf8f22b..95c3e1b 100644 --- a/configs/common/main-router +++ b/configs/common/main-router @@ -101,7 +101,6 @@ CONFIG_LUCI_LANG_pl=y ####### REPLACE CRYPTOLIB ##### # Remove section and copy from config/common/ a cryptolib section that you need. -CONFIG_PACKAGE_luci-ssl=y CONFIG_PACKAGE_wpad-basic-mbedtls=m CONFIG_PACKAGE_wpad-mbedtls=y ####### diff --git a/configs/common/mbedtls b/configs/common/mbedtls index 412ce0d..0fb7a0b 100644 --- a/configs/common/mbedtls +++ b/configs/common/mbedtls @@ -1,4 +1,2 @@ - -CONFIG_PACKAGE_luci-ssl=y CONFIG_PACKAGE_wpad-basic-mbedtls=m CONFIG_PACKAGE_wpad-mbedtls=y diff --git a/configs/common/nss b/configs/common/nss index 04bc524..0805c6e 100644 --- a/configs/common/nss +++ b/configs/common/nss @@ -102,19 +102,16 @@ CONFIG_LUCI_LANG_pl=y ##### REPLACE CRYPTOLIB ##### # mbedtls - comment it when openssl or wolfssl enabled! -CONFIG_PACKAGE_luci-ssl=y CONFIG_PACKAGE_wpad-mbedtls=y CONFIG_PACKAGE_wpad-basic-mbedtls=m ## replace mbedtls with openssl - remember to leave commented "is not set" ! -#CONFIG_PACKAGE_luci-ssl-openssl=y #CONFIG_PACKAGE_wpad-openssl=y ## CONFIG_PACKAGE_wpad-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-openssl is not set ## replace mbedtls with wolfssl - remember to leave commented "is not set" ! -# CONFIG_PACKAGE_luci-ssl-wolfssl=y # CONFIG_PACKAGE_wpad-wolfssl=y ## CONFIG_PACKAGE_wpad-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set diff --git a/configs/common/openssl b/configs/common/openssl index 6ad6461..449e375 100644 --- a/configs/common/openssl +++ b/configs/common/openssl @@ -1,6 +1,12 @@ -#### replace mbedtls with openssl - remember to leave commented "is not set" ! -CONFIG_PACKAGE_luci-ssl-openssl=y +#### replace mbedtls with openssl - remember to leave commented "is not set" or remove it! CONFIG_PACKAGE_wpad-openssl=y +CONFIG_PACKAGE_libustream-mbedtls=m +CONFIG_PACKAGE_libustream-openssl=y # CONFIG_PACKAGE_wpad-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-openssl is not set +# CONFIG_LIBCURL_MBEDTLS is not set +CONFIG_LIBCURL_OPENSSL=y +CONFIG_LUA_ECO_OPENSSL=y +# CONFIG_LUA_ECO_MBEDTLS is not set +#### replace mbedtls with openssl - remember to leave commented "is not set" or remove it! diff --git a/configs/common/wolfssl b/configs/common/wolfssl index 12f8385..50e8d50 100644 --- a/configs/common/wolfssl +++ b/configs/common/wolfssl @@ -1,5 +1,12 @@ -CONFIG_PACKAGE_luci-ssl-wolfssl=y +#### replace mbedtls with openssl - remember to leave commented "is not set" or remove it! CONFIG_PACKAGE_wpad-wolfssl=y +CONFIG_PACKAGE_libustream-mbedtls=m +CONFIG_PACKAGE_libustream-wolfssl=y # CONFIG_PACKAGE_wpad-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-openssl is not set +# CONFIG_LIBCURL_MBEDTLS is not set +CONFIG_LIBCURL_WOLFSSL=y +CONFIG_LUA_ECO_WOLFSSL=y +# CONFIG_LUA_ECO_MBEDTLS is not set +#### replace mbedtls with openssl - remember to leave commented "is not set" or remove it! diff --git a/configs/lantiq/xrx200/tdw8970 b/configs/lantiq/xrx200/tdw8970 index f0a865c..2d0cbbb 100644 --- a/configs/lantiq/xrx200/tdw8970 +++ b/configs/lantiq/xrx200/tdw8970 @@ -24,7 +24,6 @@ CONFIG_PACKAGE_luci-mod-status=y CONFIG_PACKAGE_luci-mod-system=y CONFIG_PACKAGE_luci-proto-ipv6=y CONFIG_PACKAGE_luci-proto-ppp=y -CONFIG_PACKAGE_luci-ssl=y CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_px5g-mbedtls=y CONFIG_PACKAGE_rpcd=y