Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent unused crypto lib dependencies from being compiled #10322

Closed
wants to merge 2 commits into from
Closed

Prevent unused crypto lib dependencies from being compiled #10322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47cc2bb
hostapd: prevent unused crypto lib dependencies from being compiled
borkra Jul 22, 2022
6267f97
ustream-ssl: prevent unused crypto lib dependencies from being compiled
borkra Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/libs/ustream-ssl/Makefile
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ endef
define Package/libustream-mbedtls
$(Package/libustream/default)
TITLE += (mbedtls)
DEPENDS += +libmbedtls
DEPENDS += +PACKAGE_libustream-mbedtls:libmbedtls
CONFLICTS := libustream-openssl libustream-wolfssl
VARIANT:=mbedtls
DEFAULT_VARIANT:=1
Expand Down
32 changes: 16 additions & 16 deletions package/network/services/hostapd/Makefile
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@ define Package/hostapd-openssl
$(call Package/hostapd/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=full-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_hostapd-openssl:libopenssl
endef

Package/hostapd-openssl/description = $(Package/hostapd/description)
Expand All @@ -175,7 +175,7 @@ define Package/hostapd-wolfssl
$(call Package/hostapd/Default,$(1))
TITLE+= (wolfSSL full)
VARIANT:=full-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_hostapd-wolfssl:libwolfssl
endef

Package/hostapd-wolfssl/description = $(Package/hostapd/description)
Expand All @@ -194,7 +194,7 @@ define Package/hostapd-basic-openssl
$(call Package/hostapd/Default,$(1))
TITLE+= (WPA-PSK, 11r and 11w)
VARIANT:=basic-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_hostapd-basic-openssl:libopenssl
endef

define Package/hostapd-basic-openssl/description
Expand All @@ -205,7 +205,7 @@ define Package/hostapd-basic-wolfssl
$(call Package/hostapd/Default,$(1))
TITLE+= (WPA-PSK, 11r and 11w)
VARIANT:=basic-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_hostapd-basic-wolfssl:libwolfssl
endef

define Package/hostapd-basic-wolfssl/description
Expand Down Expand Up @@ -253,7 +253,7 @@ define Package/wpad-openssl
$(call Package/wpad/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=wpad-full-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_wpad-openssl:libopenssl
endef

Package/wpad-openssl/description = $(Package/wpad/description)
Expand All @@ -262,7 +262,7 @@ define Package/wpad-wolfssl
$(call Package/wpad/Default,$(1))
TITLE+= (wolfSSL full)
VARIANT:=wpad-full-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_wpad-wolfssl:libwolfssl
endef

Package/wpad-wolfssl/description = $(Package/wpad/description)
Expand All @@ -281,7 +281,7 @@ define Package/wpad-basic-openssl
$(call Package/wpad/Default,$(1))
TITLE+= (OpenSSL, 11r, 11w)
VARIANT:=wpad-basic-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_wpad-basic-openssl:libopenssl
endef

define Package/wpad-basic-openssl/description
Expand All @@ -292,7 +292,7 @@ define Package/wpad-basic-wolfssl
$(call Package/wpad/Default,$(1))
TITLE+= (wolfSSL, 11r, 11w)
VARIANT:=wpad-basic-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_wpad-basic-wolfssl:libwolfssl
endef

define Package/wpad-basic-wolfssl/description
Expand Down Expand Up @@ -322,7 +322,7 @@ endef
define Package/wpad-mesh-openssl
$(call Package/wpad-mesh,$(1))
TITLE+= (OpenSSL, 11s, SAE)
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_wpad-mesh-openssl:libopenssl
VARIANT:=wpad-mesh-openssl
endef

Expand All @@ -331,7 +331,7 @@ Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description)
define Package/wpad-mesh-wolfssl
$(call Package/wpad-mesh,$(1))
TITLE+= (wolfSSL, 11s, SAE)
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_wpad-mesh-wolfssl:libwolfssl
VARIANT:=wpad-mesh-wolfssl
endef

Expand Down Expand Up @@ -362,14 +362,14 @@ define Package/wpa-supplicant-openssl
$(call Package/wpa-supplicant/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_wpa-supplicant-openssl:libopenssl
endef

define Package/wpa-supplicant-wolfssl
$(call Package/wpa-supplicant/Default,$(1))
TITLE+= (wolfSSL full)
VARIANT:=supplicant-full-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_wpa-supplicant-wolfssl:libwolfssl
endef

define Package/wpa-supplicant/config
Expand All @@ -393,14 +393,14 @@ define Package/wpa-supplicant-mesh-openssl
$(call Package/wpa-supplicant-mesh/Default,$(1))
TITLE+= (OpenSSL, 11s, SAE)
VARIANT:=supplicant-mesh-openssl
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_wpa-supplicant-mesh-openssl:libopenssl
endef

define Package/wpa-supplicant-mesh-wolfssl
$(call Package/wpa-supplicant-mesh/Default,$(1))
TITLE+= (wolfSSL, 11s, SAE)
VARIANT:=supplicant-mesh-wolfssl
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_wpa-supplicant-mesh-wolfssl:libwolfssl
endef

define Package/wpa-supplicant-basic
Expand Down Expand Up @@ -466,7 +466,7 @@ define Package/eapol-test-openssl
TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
DEPENDS+=+libopenssl
DEPENDS+=+PACKAGE_eapol-test-openssl:libopenssl
PROVIDES:=eapol-test
endef

Expand All @@ -475,7 +475,7 @@ define Package/eapol-test-wolfssl
TITLE+= (wolfSSL full)
VARIANT:=supplicant-full-wolfssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
DEPENDS+=+libwolfssl
DEPENDS+=+PACKAGE_eapol-test-wolfssl:libwolfssl
PROVIDES:=eapol-test
endef

Expand Down