Skip to content

Commit

Permalink
hostapd: select libopenssl-legacy for openssl variants
Browse files Browse the repository at this point in the history
Without it, a lot of authentication modes fail without obvious error messages

Signed-off-by: Felix Fietkau <[email protected]>
  • Loading branch information
nbd168 committed Aug 31, 2023
1 parent b0501d3 commit 560965d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions package/network/services/hostapd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,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=$(CONFIG_PACKAGE_kmod-cfg80211) \
Expand Down Expand Up @@ -174,7 +175,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)
Expand Down Expand Up @@ -281,7 +282,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)
Expand Down Expand Up @@ -318,7 +319,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
Expand Down Expand Up @@ -370,7 +371,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

Expand Down Expand Up @@ -419,7 +420,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
Expand Down Expand Up @@ -457,7 +458,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
Expand Down Expand Up @@ -537,7 +538,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

Expand Down

0 comments on commit 560965d

Please sign in to comment.