diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 54d2086c09..38cead90ca 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -76,6 +76,7 @@ config BR2_PACKAGE_HOSTAPD_WPS config BR2_PACKAGE_HOSTAPD_WPA3 bool "Enable WPA3 support" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help diff --git a/package/ibm-sw-tpm2/Config.in b/package/ibm-sw-tpm2/Config.in index b402ba7150..57781a54bb 100644 --- a/package/ibm-sw-tpm2/Config.in +++ b/package/ibm-sw-tpm2/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_IBM_SW_TPM2 bool "ibm-sw-tpm2" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # ibm-sw-tpm2 + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL - # libressl is not supported select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help This project is an implementation of the TCG TPM 2.0 @@ -14,4 +14,5 @@ config BR2_PACKAGE_IBM_SW_TPM2 https://sourceforge.net/projects/ibmswtpm2/ comment "ibm-sw-tpm2 needs a toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/ima-evm-utils/Config.in b/package/ima-evm-utils/Config.in index 6c29c9de28..59df58e5b3 100644 --- a/package/ima-evm-utils/Config.in +++ b/package/ima-evm-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_IMA_EVM_UTILS bool "ima-evm-utils" depends on BR2_USE_MMU # keyutils + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_KEYUTILS @@ -13,4 +14,5 @@ config BR2_PACKAGE_IMA_EVM_UTILS comment "ima-evm-utils needs dynamic library support" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 5ce91cb80f..dd47091300 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -1,5 +1,11 @@ +config BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS + bool + default y + depends on !BR2_RISCV_32 + config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL bool + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS config BR2_PACKAGE_OPENSSL bool "openssl support" @@ -11,12 +17,12 @@ if BR2_PACKAGE_OPENSSL choice prompt "ssl library" - default BR2_PACKAGE_LIBOPENSSL help Select OpenSSL or LibreSSL. config BR2_PACKAGE_LIBOPENSSL bool "openssl" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB help A collaborative effort to develop a robust, commercial-grade, diff --git a/package/softether/Config.in b/package/softether/Config.in index bfb45b0315..01104b5d39 100644 --- a/package/softether/Config.in +++ b/package/softether/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SOFTETHER depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL @@ -27,4 +28,5 @@ config BR2_PACKAGE_SOFTETHER comment "softether needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in index 4931641af4..0c60db8095 100644 --- a/package/tpm2-abrmd/Config.in +++ b/package/tpm2-abrmd/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_TPM2_ABRMD depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS @@ -22,5 +23,6 @@ config BR2_PACKAGE_TPM2_ABRMD comment "tpm2-abrmd needs a toolchain w/ dynamic library, wchar, threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/tpm2-pkcs11/Config.in b/package/tpm2-pkcs11/Config.in index 5d45703223..ec82d72ae3 100644 --- a/package/tpm2-pkcs11/Config.in +++ b/package/tpm2-pkcs11/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_PKCS11 bool "tpm2-pkcs11" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBYAML @@ -12,4 +13,5 @@ config BR2_PACKAGE_TPM2_PKCS11 https://github.com/tpm2-software/tpm2-pkcs11 comment "tpm2-pkcs11 needs a toolchain w/ dynamic library, threads" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 35ca63bf64..642bd9e462 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_TOOLS bool "tpm2-tools" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL @@ -19,4 +20,5 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools comment "tpm2-tools needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/package/tpm2-totp/Config.in b/package/tpm2-totp/Config.in index dcadf5a5f2..7f274fa130 100644 --- a/package/tpm2-totp/Config.in +++ b/package/tpm2-totp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_TOTP bool "tpm2-totp" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 select BR2_PACKAGE_LIBQRENCODE @@ -19,5 +20,6 @@ config BR2_PACKAGE_TPM2_TOTP https://github.com/tpm2-software/tpm2-totp comment "tpm2-totp needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..b1ab00dd38 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL @@ -55,4 +56,5 @@ config BR2_PACKAGE_TPM2_TSS_FAPI endif comment "tpm2-tss needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index cba7fa07e1..c6e4de1d48 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -49,6 +49,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING bool "Enable mesh networking" depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help @@ -83,6 +84,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPS config BR2_PACKAGE_WPA_SUPPLICANT_WPA3 bool "Enable WPA3 support" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help