aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-08-31 13:12:23 +0200
committerFelix Fietkau <nbd@nbd.name>2023-09-18 16:52:25 +0200
commit5e3f86a1014dd19bcf1937a876f333ecf8cc0a83 (patch)
treef904d0e2943426b1d0e47dd838f2e51195e288e5
parent90d59617515de828b1c7d03ecdb4c00e15944047 (diff)
downloadupstream-5e3f86a1014dd19bcf1937a876f333ecf8cc0a83.tar.gz
upstream-5e3f86a1014dd19bcf1937a876f333ecf8cc0a83.tar.bz2
upstream-5e3f86a1014dd19bcf1937a876f333ecf8cc0a83.zip
hostapd: select libopenssl-legacy for openssl variants
Without it, a lot of authentication modes fail without obvious error messages Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 560965d5826626e3be8c1f1db194db43cc7002cf)
-rw-r--r--package/network/services/hostapd/Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 7b94709e20..5537500313 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -80,6 +80,7 @@ ifneq ($(CONFIG_DRIVER_11AX_SUPPORT),)
endif
CORE_DEPENDS = +ucode +libubus +libucode +ucode-mod-fs +ucode-mod-nl80211 +ucode-mod-rtnl +ucode-mod-ubus +ucode-mod-uloop +libblobmsg-json
+OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl +PACKAGE_$(1):libopenssl-legacy
DRIVER_MAKEOPTS= \
CONFIG_ACS=y CONFIG_DRIVER_NL80211=y \
@@ -171,7 +172,7 @@ define Package/hostapd-openssl
$(call Package/hostapd/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=full-openssl
- DEPENDS+=+PACKAGE_hostapd-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
endef
Package/hostapd-openssl/description = $(Package/hostapd/description)
@@ -278,7 +279,7 @@ define Package/wpad-openssl
$(call Package/wpad/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=wpad-full-openssl
- DEPENDS+=+PACKAGE_wpad-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
endef
Package/wpad-openssl/description = $(Package/wpad/description)
@@ -315,7 +316,7 @@ define Package/wpad-basic-openssl
$(call Package/wpad/Default,$(1))
TITLE+= (OpenSSL, 11r, 11w)
VARIANT:=wpad-basic-openssl
- DEPENDS+=+PACKAGE_wpad-basic-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
endef
define Package/wpad-basic-openssl/description
@@ -367,7 +368,7 @@ endef
define Package/wpad-mesh-openssl
$(call Package/wpad-mesh,$(1))
TITLE+= (OpenSSL, 11s, SAE)
- DEPENDS+=+PACKAGE_wpad-mesh-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
VARIANT:=wpad-mesh-openssl
endef
@@ -416,7 +417,7 @@ define Package/wpa-supplicant-openssl
$(call Package/wpa-supplicant/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
- DEPENDS+=+PACKAGE_wpa-supplicant-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
endef
define Package/wpa-supplicant-wolfssl
@@ -453,7 +454,7 @@ define Package/wpa-supplicant-mesh-openssl
$(call Package/wpa-supplicant-mesh/Default,$(1))
TITLE+= (OpenSSL, 11s, SAE)
VARIANT:=supplicant-mesh-openssl
- DEPENDS+=+PACKAGE_wpa-supplicant-mesh-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
endef
define Package/wpa-supplicant-mesh-wolfssl
@@ -533,7 +534,7 @@ define Package/eapol-test-openssl
TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
- DEPENDS+=+PACKAGE_eapol-test-openssl:libopenssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
PROVIDES:=eapol-test
endef