mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

hostapd: remove unused fix 

Patch 050-build_fix.patch fixes the abscence of sha384-kdf.o from the
list of needed objetct files when FILS is selected without any other
option that will select the .o file.

While it is a bug waiting to be fixes upstream, it is not needed for
OpenWrt use case, because OWE already selects sha384-kdf.o, and FILS is
selected along with OWE.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
This commit is contained in:
Eneas U de Queiroz 2024-02-13 21:58:42 -03:00 committed by Felix Fietkau
parent 24d0e74627
commit 3f5a9e80da
9 changed files with 49 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/network/services/hostapd/patches/050-build_fix.patch
View File

@ -1,20 +0,0 @@
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -326,6 +326,7 @@ ifdef CONFIG_FILS
CFLAGS += -DCONFIG_FILS
OBJS += ../src/ap/fils_hlp.o
NEED_SHA384=y
+NEED_HMAC_SHA384_KDF=y
NEED_AES_SIV=y
ifdef CONFIG_FILS_SK_PFS
CFLAGS += -DCONFIG_FILS_SK_PFS
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -334,6 +334,7 @@ endif
ifdef CONFIG_FILS
CFLAGS += -DCONFIG_FILS
NEED_SHA384=y
+NEED_HMAC_SHA384_KDF=y
NEED_AES_SIV=y
ifdef CONFIG_FILS_SK_PFS
CFLAGS += -DCONFIG_FILS_SK_PFS

38
package/network/services/hostapd/patches/110-mbedtls-TLS-crypto-option-initial-port.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
--- a/hostapd/Makefile --- a/hostapd/Makefile
+++ b/hostapd/Makefile +++ b/hostapd/Makefile
@@ -758,6 +758,40 @@ endif @@ -757,6 +757,40 @@ endif
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\" CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
endif endif
@ -62,7 +62,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifeq ($(CONFIG_TLS), gnutls) ifeq ($(CONFIG_TLS), gnutls)
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
# default to libgcrypt # default to libgcrypt
@@ -937,9 +971,11 @@ endif @@ -936,9 +970,11 @@ endif
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -74,7 +74,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y NEED_AES_CTR=y
@@ -949,38 +985,48 @@ AESOBJS += ../src/crypto/aes-siv.o @@ -948,38 +984,48 @@ AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y NEED_AES_CTR=y
endif endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
@ -123,7 +123,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_AES_DEC ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-dec.o AESOBJS += ../src/crypto/aes-internal-dec.o
@@ -995,12 +1041,16 @@ ifneq ($(CONFIG_TLS), openssl) @@ -994,12 +1040,16 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls) ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -140,7 +140,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_INTERNAL_SHA1 ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF ifdef NEED_FIPS186_2_PRF
@@ -1009,16 +1059,22 @@ endif @@ -1008,16 +1058,22 @@ endif
endif endif
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -163,7 +163,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_SHA1 ifdef NEED_SHA1
OBJS += $(SHA1OBJS) OBJS += $(SHA1OBJS)
@@ -1028,11 +1084,13 @@ ifneq ($(CONFIG_TLS), openssl) @@ -1027,11 +1083,13 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls) ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -177,7 +177,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_MD5 ifdef NEED_MD5
ifdef CONFIG_INTERNAL_MD5 ifdef CONFIG_INTERNAL_MD5
@@ -1071,56 +1129,81 @@ ifneq ($(CONFIG_TLS), openssl) @@ -1070,56 +1128,81 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls) ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -259,7 +259,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_INTERNAL_SHA384 ifdef CONFIG_INTERNAL_SHA384
CFLAGS += -DCONFIG_INTERNAL_SHA384 CFLAGS += -DCONFIG_INTERNAL_SHA384
@@ -1165,11 +1248,13 @@ HOBJS += $(SHA1OBJS) @@ -1164,11 +1247,13 @@ HOBJS += $(SHA1OBJS)
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -273,7 +273,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_RADIUS_SERVER ifdef CONFIG_RADIUS_SERVER
CFLAGS += -DRADIUS_SERVER CFLAGS += -DRADIUS_SERVER
@@ -1342,7 +1427,9 @@ NOBJS += ../src/utils/trace.o @@ -1341,7 +1426,9 @@ NOBJS += ../src/utils/trace.o
endif endif
HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
@ -283,7 +283,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
HOBJS += ../src/crypto/aes-internal.o HOBJS += ../src/crypto/aes-internal.o
HOBJS += ../src/crypto/aes-internal-enc.o HOBJS += ../src/crypto/aes-internal-enc.o
@@ -1365,13 +1452,17 @@ SOBJS += ../src/common/sae.o @@ -1364,13 +1451,17 @@ SOBJS += ../src/common/sae.o
SOBJS += ../src/common/sae_pk.o SOBJS += ../src/common/sae_pk.o
SOBJS += ../src/common/dragonfly.o SOBJS += ../src/common/dragonfly.o
SOBJS += $(AESOBJS) SOBJS += $(AESOBJS)
@ -7765,7 +7765,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
CONFIG_SIM_SIMULATOR=y CONFIG_SIM_SIMULATOR=y
--- a/wpa_supplicant/Makefile --- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile
@@ -1230,6 +1230,29 @@ endif @@ -1229,6 +1229,29 @@ endif
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\" CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
endif endif
@ -7795,7 +7795,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifeq ($(CONFIG_TLS), gnutls) ifeq ($(CONFIG_TLS), gnutls)
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
# default to libgcrypt # default to libgcrypt
@@ -1422,9 +1445,11 @@ endif @@ -1421,9 +1444,11 @@ endif
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -7807,7 +7807,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_OPENSSL_INTERNAL_AES_WRAP ifdef CONFIG_OPENSSL_INTERNAL_AES_WRAP
# Seems to be needed at least with BoringSSL # Seems to be needed at least with BoringSSL
NEED_INTERNAL_AES_WRAP=y NEED_INTERNAL_AES_WRAP=y
@@ -1438,9 +1463,11 @@ endif @@ -1437,9 +1462,11 @@ endif
ifdef NEED_INTERNAL_AES_WRAP ifdef NEED_INTERNAL_AES_WRAP
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
@ -7819,7 +7819,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y NEED_AES_CTR=y
@@ -1450,35 +1477,45 @@ AESOBJS += ../src/crypto/aes-siv.o @@ -1449,35 +1476,45 @@ AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y NEED_AES_CTR=y
endif endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
@ -7865,7 +7865,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_AES_ENC ifdef NEED_AES_ENC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-enc.o AESOBJS += ../src/crypto/aes-internal-enc.o
@@ -1493,12 +1530,16 @@ ifneq ($(CONFIG_TLS), openssl) @@ -1492,12 +1529,16 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls) ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -7882,7 +7882,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_INTERNAL_SHA1 ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF ifdef NEED_FIPS186_2_PRF
@@ -1510,29 +1551,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2 @@ -1509,29 +1550,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2
else else
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -7920,7 +7920,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_MD5 ifdef NEED_MD5
ifdef CONFIG_INTERNAL_MD5 ifdef CONFIG_INTERNAL_MD5
MD5OBJS += ../src/crypto/md5-internal.o MD5OBJS += ../src/crypto/md5-internal.o
@@ -1587,12 +1636,17 @@ ifneq ($(CONFIG_TLS), openssl) @@ -1586,12 +1635,17 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls) ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)
@ -7938,7 +7938,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef CONFIG_INTERNAL_SHA256 ifdef CONFIG_INTERNAL_SHA256
SHA256OBJS += ../src/crypto/sha256-internal.o SHA256OBJS += ../src/crypto/sha256-internal.o
endif endif
@@ -1605,50 +1659,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512 @@ -1604,50 +1658,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512
SHA256OBJS += ../src/crypto/sha512-internal.o SHA256OBJS += ../src/crypto/sha512-internal.o
endif endif
ifdef NEED_TLS_PRF_SHA256 ifdef NEED_TLS_PRF_SHA256
@ -8007,7 +8007,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef NEED_ASN1 ifdef NEED_ASN1
OBJS += ../src/tls/asn1.o OBJS += ../src/tls/asn1.o
@@ -1823,10 +1895,12 @@ ifdef CONFIG_FIPS @@ -1822,10 +1894,12 @@ ifdef CONFIG_FIPS
CFLAGS += -DCONFIG_FIPS CFLAGS += -DCONFIG_FIPS
ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl) ifneq ($(CONFIG_TLS), wolfssl)

4
package/network/services/hostapd/patches/120-mbedtls-fips186_2_prf.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
--- a/hostapd/Makefile --- a/hostapd/Makefile
+++ b/hostapd/Makefile +++ b/hostapd/Makefile
@@ -772,10 +772,6 @@ endif @@ -771,10 +771,6 @@ endif
OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
HOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o HOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
SOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o SOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
@ -101,7 +101,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
--- a/wpa_supplicant/Makefile --- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile
@@ -1241,10 +1241,6 @@ endif @@ -1240,10 +1240,6 @@ endif
OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
OBJS_p += ../src/crypto/crypto_$(CONFIG_CRYPTO).o OBJS_p += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
OBJS_priv += ../src/crypto/crypto_$(CONFIG_CRYPTO).o OBJS_priv += ../src/crypto/crypto_$(CONFIG_CRYPTO).o

24
package/network/services/hostapd/patches/140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch
View File

@ -61,7 +61,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
--- a/hostapd/Makefile --- a/hostapd/Makefile
+++ b/hostapd/Makefile +++ b/hostapd/Makefile
@@ -709,6 +709,7 @@ CFLAGS += -DCONFIG_TLSV12 @@ -708,6 +708,7 @@ CFLAGS += -DCONFIG_TLSV12
endif endif
ifeq ($(CONFIG_TLS), wolfssl) ifeq ($(CONFIG_TLS), wolfssl)
@ -69,7 +69,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
CONFIG_CRYPTO=wolfssl CONFIG_CRYPTO=wolfssl
ifdef TLS_FUNCS ifdef TLS_FUNCS
OBJS += ../src/crypto/tls_wolfssl.o OBJS += ../src/crypto/tls_wolfssl.o
@@ -729,6 +730,7 @@ endif @@ -728,6 +729,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), openssl) ifeq ($(CONFIG_TLS), openssl)
@ -77,7 +77,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
CONFIG_CRYPTO=openssl CONFIG_CRYPTO=openssl
ifdef TLS_FUNCS ifdef TLS_FUNCS
@@ -759,6 +761,7 @@ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONF @@ -758,6 +760,7 @@ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONF
endif endif
ifeq ($(CONFIG_TLS), mbedtls) ifeq ($(CONFIG_TLS), mbedtls)
@ -85,7 +85,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=mbedtls CONFIG_CRYPTO=mbedtls
endif endif
@@ -789,6 +792,7 @@ endif @@ -788,6 +791,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), gnutls) ifeq ($(CONFIG_TLS), gnutls)
@ -93,7 +93,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
# default to libgcrypt # default to libgcrypt
CONFIG_CRYPTO=gnutls CONFIG_CRYPTO=gnutls
@@ -819,6 +823,7 @@ endif @@ -818,6 +822,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), internal) ifeq ($(CONFIG_TLS), internal)
@ -101,7 +101,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=internal CONFIG_CRYPTO=internal
endif endif
@@ -897,6 +902,7 @@ endif @@ -896,6 +901,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), linux) ifeq ($(CONFIG_TLS), linux)
@ -1294,7 +1294,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
if (need_more_data) { if (need_more_data) {
--- a/wpa_supplicant/Makefile --- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile
@@ -1189,6 +1189,7 @@ TLS_FUNCS=y @@ -1188,6 +1188,7 @@ TLS_FUNCS=y
endif endif
ifeq ($(CONFIG_TLS), wolfssl) ifeq ($(CONFIG_TLS), wolfssl)
@ -1302,7 +1302,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifdef TLS_FUNCS ifdef TLS_FUNCS
CFLAGS += -DWOLFSSL_DER_LOAD CFLAGS += -DWOLFSSL_DER_LOAD
OBJS += ../src/crypto/tls_wolfssl.o OBJS += ../src/crypto/tls_wolfssl.o
@@ -1204,6 +1205,7 @@ LIBS_p += -lwolfssl -lm @@ -1203,6 +1204,7 @@ LIBS_p += -lwolfssl -lm
endif endif
ifeq ($(CONFIG_TLS), openssl) ifeq ($(CONFIG_TLS), openssl)
@ -1310,7 +1310,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
ifdef TLS_FUNCS ifdef TLS_FUNCS
CFLAGS += -DEAP_TLS_OPENSSL CFLAGS += -DEAP_TLS_OPENSSL
@@ -1231,6 +1233,7 @@ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONF @@ -1230,6 +1232,7 @@ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONF
endif endif
ifeq ($(CONFIG_TLS), mbedtls) ifeq ($(CONFIG_TLS), mbedtls)
@ -1318,7 +1318,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=mbedtls CONFIG_CRYPTO=mbedtls
endif endif
@@ -1250,6 +1253,7 @@ endif @@ -1249,6 +1252,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), gnutls) ifeq ($(CONFIG_TLS), gnutls)
@ -1326,7 +1326,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
# default to libgcrypt # default to libgcrypt
CONFIG_CRYPTO=gnutls CONFIG_CRYPTO=gnutls
@@ -1280,6 +1284,7 @@ endif @@ -1279,6 +1283,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), internal) ifeq ($(CONFIG_TLS), internal)
@ -1334,7 +1334,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
ifndef CONFIG_CRYPTO ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=internal CONFIG_CRYPTO=internal
endif endif
@@ -1360,6 +1365,7 @@ endif @@ -1359,6 +1364,7 @@ endif
endif endif
ifeq ($(CONFIG_TLS), linux) ifeq ($(CONFIG_TLS), linux)

20
package/network/services/hostapd/patches/200-multicall.patch
View File

@ -18,7 +18,7 @@
OBJS += ../src/ap/vlan_init.o OBJS += ../src/ap/vlan_init.o
OBJS += ../src/ap/vlan_ifconfig.o OBJS += ../src/ap/vlan_ifconfig.o
OBJS += ../src/ap/vlan.o OBJS += ../src/ap/vlan.o
@@ -359,10 +361,14 @@ CFLAGS += -DCONFIG_MBO @@ -358,10 +360,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o OBJS += ../src/ap/mbo_ap.o
endif endif
@ -36,7 +36,7 @@
LIBS += $(DRV_AP_LIBS) LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET ifdef CONFIG_L2_PACKET
@@ -1393,6 +1399,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR) @@ -1392,6 +1398,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
_OBJS_VAR := OBJS _OBJS_VAR := OBJS
include ../src/objs.mk include ../src/objs.mk
@ -49,7 +49,7 @@
hostapd: $(OBJS) hostapd: $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@ @$(E) " LD " $@
@@ -1473,6 +1485,12 @@ include ../src/objs.mk @@ -1472,6 +1484,12 @@ include ../src/objs.mk
_OBJS_VAR := SOBJS _OBJS_VAR := SOBJS
include ../src/objs.mk include ../src/objs.mk
@ -72,7 +72,7 @@
include ../src/build.rules include ../src/build.rules
ifdef CONFIG_BUILD_PASN_SO ifdef CONFIG_BUILD_PASN_SO
@@ -389,7 +390,9 @@ endif @@ -388,7 +389,9 @@ endif
ifdef CONFIG_IBSS_RSN ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN CFLAGS += -DCONFIG_IBSS_RSN
@ -82,7 +82,7 @@
OBJS += ibss_rsn.o OBJS += ibss_rsn.o
endif endif
@@ -981,6 +984,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS @@ -980,6 +983,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic LIBS += -ldl -rdynamic
endif endif
@ -93,7 +93,7 @@
endif endif
ifdef CONFIG_AP ifdef CONFIG_AP
@@ -988,9 +995,11 @@ NEED_EAP_COMMON=y @@ -987,9 +994,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP CFLAGS += -DCONFIG_AP
OBJS += ap.o OBJS += ap.o
@ -105,7 +105,7 @@
OBJS += ../src/ap/hostapd.o OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o OBJS += ../src/ap/utils.o
@@ -1081,6 +1090,12 @@ endif @@ -1080,6 +1089,12 @@ endif
ifdef CONFIG_HS20 ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o OBJS += ../src/ap/hs20.o
endif endif
@ -118,7 +118,7 @@
endif endif
ifdef CONFIG_MBO ifdef CONFIG_MBO
@@ -1090,7 +1105,9 @@ NEED_GAS=y @@ -1089,7 +1104,9 @@ NEED_GAS=y
endif endif
ifdef NEED_RSN_AUTHENTICATOR ifdef NEED_RSN_AUTHENTICATOR
@ -128,7 +128,7 @@
NEED_AES_WRAP=y NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o OBJS += ../src/ap/wpa_auth_ie.o
@@ -2080,6 +2097,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) @@ -2079,6 +2096,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
_OBJS_VAR := OBJS _OBJS_VAR := OBJS
include ../src/objs.mk include ../src/objs.mk
@ -141,7 +141,7 @@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@ @$(E) " LD " $@
@@ -2212,6 +2235,12 @@ eap_gpsk.so: $(SRC_EAP_GPSK) @@ -2211,6 +2234,12 @@ eap_gpsk.so: $(SRC_EAP_GPSK)
$(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
@$(E) " sed" $< @$(E) " sed" $<

2
package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
View File

@ -30,7 +30,7 @@
reply_len = -1; reply_len = -1;
--- a/wpa_supplicant/Makefile --- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile
@@ -1039,6 +1039,9 @@ ifdef CONFIG_FILS @@ -1038,6 +1038,9 @@ ifdef CONFIG_FILS
OBJS += ../src/ap/fils_hlp.o OBJS += ../src/ap/fils_hlp.o
endif endif
ifdef CONFIG_CTRL_IFACE ifdef CONFIG_CTRL_IFACE

6
package/network/services/hostapd/patches/500-lto-jobserver-support.patch
View File

@ -1,6 +1,6 @@
--- a/hostapd/Makefile --- a/hostapd/Makefile
+++ b/hostapd/Makefile +++ b/hostapd/Makefile
@@ -1409,7 +1409,7 @@ hostapd_multi.a: $(BCHECK) $(OBJS) @@ -1408,7 +1408,7 @@ hostapd_multi.a: $(BCHECK) $(OBJS)
@$(AR) cr $@ hostapd_multi.o $(OBJS) @$(AR) cr $@ hostapd_multi.o $(OBJS)
hostapd: $(OBJS) hostapd: $(OBJS)
@ -9,7 +9,7 @@
@$(E) " LD " $@ @$(E) " LD " $@
ifdef CONFIG_WPA_TRACE ifdef CONFIG_WPA_TRACE
@@ -1420,7 +1420,7 @@ _OBJS_VAR := OBJS_c @@ -1419,7 +1419,7 @@ _OBJS_VAR := OBJS_c
include ../src/objs.mk include ../src/objs.mk
hostapd_cli: $(OBJS_c) hostapd_cli: $(OBJS_c)
@ -20,7 +20,7 @@
NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
--- a/wpa_supplicant/Makefile --- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile
@@ -2107,31 +2107,31 @@ wpa_supplicant_multi.a: .config $(BCHECK @@ -2106,31 +2106,31 @@ wpa_supplicant_multi.a: .config $(BCHECK
@$(AR) cr $@ wpa_supplicant_multi.o $(OBJS) @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)

2
package/network/services/hostapd/patches/600-ubus_support.patch
View File

@ -336,7 +336,7 @@
ifdef CONFIG_CODE_COVERAGE ifdef CONFIG_CODE_COVERAGE
CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE
LIBS += -lgcov LIBS += -lgcov
@@ -1043,6 +1050,9 @@ ifdef CONFIG_CTRL_IFACE_MIB @@ -1042,6 +1049,9 @@ ifdef CONFIG_CTRL_IFACE_MIB
CFLAGS += -DCONFIG_CTRL_IFACE_MIB CFLAGS += -DCONFIG_CTRL_IFACE_MIB
endif endif
OBJS += ../src/ap/ctrl_iface_ap.o OBJS += ../src/ap/ctrl_iface_ap.o

2
package/network/services/hostapd/patches/601-ucode_support.patch
View File

@ -176,7 +176,7 @@
endif endif
ifdef CONFIG_CODE_COVERAGE ifdef CONFIG_CODE_COVERAGE
@@ -1053,6 +1065,9 @@ OBJS += ../src/ap/ctrl_iface_ap.o @@ -1052,6 +1064,9 @@ OBJS += ../src/ap/ctrl_iface_ap.o
ifdef CONFIG_UBUS ifdef CONFIG_UBUS
OBJS += ../src/ap/ubus.o OBJS += ../src/ap/ubus.o
endif endif