Skip to content

Commit acf9796

Browse files
PolynomialDivisionPolynomialDivision
committed
hostapd: update to 2026-04-02
Patches automatically refreshed. Link: openwrt/openwrt#22745 Signed-off-by: Nick Hainke <vincent@systemli.org>
1 parent d9eb01a commit acf9796

30 files changed

Lines changed: 192 additions & 192 deletions

‎package/network/services/hostapd/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
99

1010
PKG_SOURCE_URL:=https://w1.fi/hostap.git
1111
PKG_SOURCE_PROTO:=git
12-
PKG_SOURCE_DATE:=2026-03-23
13-
PKG_SOURCE_VERSION:=3f9b7ae0780973446d3feea27b4caf6dbf43f0c6
14-
PKG_MIRROR_HASH:=5421a6bfe145559d27930010f1aba7781a483898e6de5462024871388f114661
12+
PKG_SOURCE_DATE:=2026-04-02
13+
PKG_SOURCE_VERSION:=b004de0bf1b54d669d358b7f33d6f474bd9719a6
14+
PKG_MIRROR_HASH:=0b0184e600c994a1f0415f52e8af26b39f13e376a30cdf0b4f3ca1a206e52fc8
1515

1616
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
1717
PKG_LICENSE:=BSD-3-Clause

‎package/network/services/hostapd/patches/010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
1414

1515
--- a/wpa_supplicant/wpa_supplicant.c
1616
+++ b/wpa_supplicant/wpa_supplicant.c
17-
@@ -3047,7 +3047,7 @@ static int drv_supports_vht(struct wpa_s
17+
@@ -3048,7 +3048,7 @@ static int drv_supports_vht(struct wpa_s
1818
}
1919

2020

@@ -23,7 +23,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
2323
{
2424
int i;
2525

26-
@@ -3056,7 +3056,10 @@ static bool ibss_mesh_is_80mhz_avail(int
26+
@@ -3057,7 +3057,10 @@ static bool ibss_mesh_is_80mhz_avail(int
2727

2828
chan = hw_get_channel_chan(mode, i, NULL);
2929
if (!chan ||
@@ -35,7 +35,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
3535
return false;
3636
}
3737

38-
@@ -3183,7 +3186,7 @@ static void ibss_mesh_select_40mhz(struc
38+
@@ -3184,7 +3187,7 @@ static void ibss_mesh_select_40mhz(struc
3939
const struct wpa_ssid *ssid,
4040
struct hostapd_hw_modes *mode,
4141
struct hostapd_freq_params *freq,
@@ -44,7 +44,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
4444
{
4545
int chan_idx;
4646
struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
47-
@@ -3214,8 +3217,11 @@ static void ibss_mesh_select_40mhz(struc
47+
@@ -3215,8 +3218,11 @@ static void ibss_mesh_select_40mhz(struc
4848
return;
4949

5050
/* Check primary channel flags */
@@ -58,7 +58,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
5858

5959
#ifdef CONFIG_HT_OVERRIDES
6060
if (ssid->disable_ht40)
61-
@@ -3250,8 +3256,11 @@ static void ibss_mesh_select_40mhz(struc
61+
@@ -3251,8 +3257,11 @@ static void ibss_mesh_select_40mhz(struc
6262
return;
6363

6464
/* Check secondary channel flags */
@@ -72,7 +72,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
7272

7373
if (freq->ht_enabled) {
7474
if (ht40 == -1) {
75-
@@ -3329,7 +3338,7 @@ static bool ibss_mesh_select_80_160mhz(s
75+
@@ -3330,7 +3339,7 @@ static bool ibss_mesh_select_80_160mhz(s
7676
const struct wpa_ssid *ssid,
7777
struct hostapd_hw_modes *mode,
7878
struct hostapd_freq_params *freq,
@@ -81,7 +81,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
8181
static const int bw80[] = {
8282
5180, 5260, 5500, 5580, 5660, 5745, 5825,
8383
5955, 6035, 6115, 6195, 6275, 6355, 6435,
84-
@@ -3382,7 +3391,7 @@ static bool ibss_mesh_select_80_160mhz(s
84+
@@ -3383,7 +3392,7 @@ static bool ibss_mesh_select_80_160mhz(s
8585
goto skip_80mhz;
8686

8787
/* Use 40 MHz if channel not usable */
@@ -90,7 +90,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
9090
goto skip_80mhz;
9191

9292
chwidth = CONF_OPER_CHWIDTH_80MHZ;
93-
@@ -3424,7 +3433,7 @@ static bool ibss_mesh_select_80_160mhz(s
93+
@@ -3425,7 +3434,7 @@ static bool ibss_mesh_select_80_160mhz(s
9494
HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) &&
9595
(ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_160MHZ ||
9696
ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_320MHZ) &&
@@ -99,7 +99,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
9999
for (j = 0; j < ARRAY_SIZE(bw160); j++) {
100100
u8 start_chan;
101101

102-
@@ -3447,11 +3456,11 @@ static bool ibss_mesh_select_80_160mhz(s
102+
@@ -3448,11 +3457,11 @@ static bool ibss_mesh_select_80_160mhz(s
103103
EHT_PHYCAP_320MHZ_IN_6GHZ_SUPPORT_MASK) && is_6ghz &&
104104
ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_320MHZ &&
105105
ibss_mesh_is_80mhz_avail(channel + 16 -
@@ -114,7 +114,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
114114
for (j = 0; j < ARRAY_SIZE(bw320); j += 2) {
115115
if (freq->freq >= bw320[j] &&
116116
freq->freq <= bw320[j + 1]) {
117-
@@ -3480,10 +3489,12 @@ static bool ibss_mesh_select_80_160mhz(s
117+
@@ -3481,10 +3490,12 @@ static bool ibss_mesh_select_80_160mhz(s
118118
if (!chan)
119119
continue;
120120

@@ -131,15 +131,15 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
131131

132132
/* Found a suitable second segment for 80+80 */
133133
chwidth = CONF_OPER_CHWIDTH_80P80MHZ;
134-
@@ -3538,6 +3549,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
134+
@@ -3539,6 +3550,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
135135
int obss_scan = 1;
136136
u8 channel;
137137
bool is_6ghz, is_24ghz;
138138
+ bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
139139

140140
freq->freq = ssid->frequency;
141141

142-
@@ -3581,9 +3593,9 @@ void ibss_mesh_setup_freq(struct wpa_sup
142+
@@ -3582,9 +3594,9 @@ void ibss_mesh_setup_freq(struct wpa_sup
143143
/* Setup higher BW only for 5 and 6 GHz */
144144
if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
145145
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan,

‎package/network/services/hostapd/patches/011-mesh-use-deterministic-channel-on-channel-switch.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
6868
chan_idx, num_available_chandefs);
6969
--- a/src/drivers/driver_nl80211.c
7070
+++ b/src/drivers/driver_nl80211.c
71-
@@ -12010,6 +12010,10 @@ static int nl80211_switch_channel(void *
71+
@@ -12012,6 +12012,10 @@ static int nl80211_switch_channel(void *
7272
if (ret)
7373
goto error;
7474

‎package/network/services/hostapd/patches/021-fix-sta-add-after-previous-connection.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Subject: [PATCH] fix adding back stations after a missed deauth/disassoc
44

55
--- a/src/ap/ieee802_11.c
66
+++ b/src/ap/ieee802_11.c
7-
@@ -5566,6 +5566,13 @@ static int add_associated_sta(struct hos
7+
@@ -6370,6 +6370,13 @@ static int add_associated_sta(struct hos
88
* drivers to accept the STA parameter configuration. Since this is
99
* after a new FT-over-DS exchange, a new TK has been derived, so key
1010
* reinstallation is not a concern for this case.
@@ -18,7 +18,7 @@ Subject: [PATCH] fix adding back stations after a missed deauth/disassoc
1818
*/
1919
wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
2020
" (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
21-
@@ -5579,7 +5586,8 @@ static int add_associated_sta(struct hos
21+
@@ -6383,7 +6390,8 @@ static int add_associated_sta(struct hos
2222
(!(sta->flags & WLAN_STA_AUTHORIZED) ||
2323
(reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
2424
(!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&

‎package/network/services/hostapd/patches/050-Fix-OpenWrt-13156.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2020

2121
--- a/src/ap/hostapd.c
2222
+++ b/src/ap/hostapd.c
23-
@@ -4123,6 +4123,8 @@ int hostapd_remove_iface(struct hapd_int
23+
@@ -4126,6 +4126,8 @@ int hostapd_remove_iface(struct hapd_int
2424
void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
2525
int reassoc)
2626
{
@@ -29,7 +29,7 @@ Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2929
if (hapd->tkip_countermeasures) {
3030
hostapd_drv_sta_deauth(hapd, sta->addr,
3131
WLAN_REASON_MICHAEL_MIC_FAILURE);
32-
@@ -4130,10 +4132,16 @@ void hostapd_new_assoc_sta(struct hostap
32+
@@ -4133,10 +4135,16 @@ void hostapd_new_assoc_sta(struct hostap
3333
}
3434

3535
#ifdef CONFIG_IEEE80211BE
@@ -51,7 +51,7 @@ Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
5151
ap_sta_clear_assoc_timeout(hapd, sta);
5252
--- a/src/ap/sta_info.c
5353
+++ b/src/ap/sta_info.c
54-
@@ -1736,9 +1736,6 @@ bool ap_sta_set_authorized_flag(struct h
54+
@@ -1742,9 +1742,6 @@ bool ap_sta_set_authorized_flag(struct h
5555
mld_assoc_link_id = -2;
5656
}
5757
#endif /* CONFIG_IEEE80211BE */

‎package/network/services/hostapd/patches/051-nl80211-add-extra-ies-only-if-allowed-by-driver.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
2626

2727
--- a/src/drivers/driver.h
2828
+++ b/src/drivers/driver.h
29-
@@ -2467,6 +2467,9 @@ struct wpa_driver_capa {
29+
@@ -2469,6 +2469,9 @@ struct wpa_driver_capa {
3030
/** Maximum number of iterations in a single scan plan */
3131
u32 max_sched_scan_plan_iterations;
3232

@@ -38,7 +38,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
3838

3939
--- a/src/drivers/driver_nl80211_capa.c
4040
+++ b/src/drivers/driver_nl80211_capa.c
41-
@@ -1000,6 +1000,10 @@ static int wiphy_info_handler(struct nl_
41+
@@ -1004,6 +1004,10 @@ static int wiphy_info_handler(struct nl_
4242
nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]);
4343
}
4444

@@ -51,7 +51,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
5151
nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]);
5252
--- a/src/drivers/driver_nl80211_scan.c
5353
+++ b/src/drivers/driver_nl80211_scan.c
54-
@@ -235,7 +235,7 @@ nl80211_scan_common(struct i802_bss *bss
54+
@@ -236,7 +236,7 @@ nl80211_scan_common(struct i802_bss *bss
5555
wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
5656
}
5757

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2121

2222
--- a/hostapd/Makefile
2323
+++ b/hostapd/Makefile
24-
@@ -769,6 +769,40 @@ endif
24+
@@ -774,6 +774,40 @@ endif
2525
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
2626
endif
2727

@@ -62,7 +62,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
6262
ifeq ($(CONFIG_TLS), gnutls)
6363
ifndef CONFIG_CRYPTO
6464
# default to libgcrypt
65-
@@ -948,9 +982,11 @@ endif
65+
@@ -953,9 +987,11 @@ endif
6666

6767
ifneq ($(CONFIG_TLS), openssl)
6868
ifneq ($(CONFIG_TLS), wolfssl)
@@ -74,7 +74,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
7474
ifdef NEED_AES_EAX
7575
AESOBJS += ../src/crypto/aes-eax.o
7676
NEED_AES_CTR=y
77-
@@ -960,38 +996,48 @@ AESOBJS += ../src/crypto/aes-siv.o
77+
@@ -965,38 +1001,48 @@ AESOBJS += ../src/crypto/aes-siv.o
7878
NEED_AES_CTR=y
7979
endif
8080
ifdef NEED_AES_CTR
@@ -123,7 +123,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
123123
ifdef NEED_AES_DEC
124124
ifdef CONFIG_INTERNAL_AES
125125
AESOBJS += ../src/crypto/aes-internal-dec.o
126-
@@ -1006,12 +1052,16 @@ ifneq ($(CONFIG_TLS), openssl)
126+
@@ -1011,12 +1057,16 @@ ifneq ($(CONFIG_TLS), openssl)
127127
ifneq ($(CONFIG_TLS), linux)
128128
ifneq ($(CONFIG_TLS), gnutls)
129129
ifneq ($(CONFIG_TLS), wolfssl)
@@ -140,7 +140,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
140140
ifdef CONFIG_INTERNAL_SHA1
141141
SHA1OBJS += ../src/crypto/sha1-internal.o
142142
ifdef NEED_FIPS186_2_PRF
143-
@@ -1020,16 +1070,22 @@ endif
143+
@@ -1025,16 +1075,22 @@ endif
144144
endif
145145
ifneq ($(CONFIG_TLS), openssl)
146146
ifneq ($(CONFIG_TLS), wolfssl)
@@ -163,7 +163,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
163163

164164
ifdef NEED_SHA1
165165
OBJS += $(SHA1OBJS)
166-
@@ -1039,11 +1095,13 @@ ifneq ($(CONFIG_TLS), openssl)
166+
@@ -1044,11 +1100,13 @@ ifneq ($(CONFIG_TLS), openssl)
167167
ifneq ($(CONFIG_TLS), linux)
168168
ifneq ($(CONFIG_TLS), gnutls)
169169
ifneq ($(CONFIG_TLS), wolfssl)
@@ -177,7 +177,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
177177

178178
ifdef NEED_MD5
179179
ifdef CONFIG_INTERNAL_MD5
180-
@@ -1096,56 +1154,81 @@ ifneq ($(CONFIG_TLS), openssl)
180+
@@ -1101,56 +1159,81 @@ ifneq ($(CONFIG_TLS), openssl)
181181
ifneq ($(CONFIG_TLS), linux)
182182
ifneq ($(CONFIG_TLS), gnutls)
183183
ifneq ($(CONFIG_TLS), wolfssl)
@@ -259,7 +259,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
259259

260260
ifdef CONFIG_INTERNAL_SHA384
261261
CFLAGS += -DCONFIG_INTERNAL_SHA384
262-
@@ -1190,11 +1273,13 @@ HOBJS += $(SHA1OBJS)
262+
@@ -1195,11 +1278,13 @@ HOBJS += $(SHA1OBJS)
263263
ifneq ($(CONFIG_TLS), openssl)
264264
ifneq ($(CONFIG_TLS), linux)
265265
ifneq ($(CONFIG_TLS), wolfssl)
@@ -273,7 +273,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
273273

274274
ifdef CONFIG_RADIUS_SERVER
275275
CFLAGS += -DRADIUS_SERVER
276-
@@ -1374,7 +1459,9 @@ NOBJS += ../src/utils/trace.o
276+
@@ -1379,7 +1464,9 @@ NOBJS += ../src/utils/trace.o
277277
endif
278278

279279
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>
283283
ifdef CONFIG_INTERNAL_AES
284284
HOBJS += ../src/crypto/aes-internal.o
285285
HOBJS += ../src/crypto/aes-internal-enc.o
286-
@@ -1397,18 +1484,24 @@ SOBJS += ../src/common/sae.o
286+
@@ -1402,18 +1489,24 @@ SOBJS += ../src/common/sae.o
287287
SOBJS += ../src/common/sae_pk.o
288288
SOBJS += ../src/common/dragonfly.o
289289
SOBJS += $(AESOBJS)
@@ -7770,7 +7770,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
77707770
CONFIG_SIM_SIMULATOR=y
77717771
--- a/wpa_supplicant/Makefile
77727772
+++ b/wpa_supplicant/Makefile
7773-
@@ -1266,6 +1266,29 @@ endif
7773+
@@ -1271,6 +1271,29 @@ endif
77747774
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
77757775
endif
77767776

@@ -7800,7 +7800,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
78007800
ifeq ($(CONFIG_TLS), gnutls)
78017801
ifndef CONFIG_CRYPTO
78027802
# default to libgcrypt
7803-
@@ -1458,9 +1481,11 @@ endif
7803+
@@ -1463,9 +1486,11 @@ endif
78047804

78057805
ifneq ($(CONFIG_TLS), openssl)
78067806
ifneq ($(CONFIG_TLS), wolfssl)
@@ -7812,7 +7812,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
78127812
ifdef CONFIG_OPENSSL_INTERNAL_AES_WRAP
78137813
# Seems to be needed at least with BoringSSL
78147814
NEED_INTERNAL_AES_WRAP=y
7815-
@@ -1474,9 +1499,11 @@ endif
7815+
@@ -1479,9 +1504,11 @@ endif
78167816

78177817
ifdef NEED_INTERNAL_AES_WRAP
78187818
ifneq ($(CONFIG_TLS), linux)
@@ -7824,7 +7824,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
78247824
ifdef NEED_AES_EAX
78257825
AESOBJS += ../src/crypto/aes-eax.o
78267826
NEED_AES_CTR=y
7827-
@@ -1486,35 +1513,45 @@ AESOBJS += ../src/crypto/aes-siv.o
7827+
@@ -1491,35 +1518,45 @@ AESOBJS += ../src/crypto/aes-siv.o
78287828
NEED_AES_CTR=y
78297829
endif
78307830
ifdef NEED_AES_CTR
@@ -7870,7 +7870,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
78707870
ifdef NEED_AES_ENC
78717871
ifdef CONFIG_INTERNAL_AES
78727872
AESOBJS += ../src/crypto/aes-internal-enc.o
7873-
@@ -1529,12 +1566,16 @@ ifneq ($(CONFIG_TLS), openssl)
7873+
@@ -1534,12 +1571,16 @@ ifneq ($(CONFIG_TLS), openssl)
78747874
ifneq ($(CONFIG_TLS), linux)
78757875
ifneq ($(CONFIG_TLS), gnutls)
78767876
ifneq ($(CONFIG_TLS), wolfssl)
@@ -7887,7 +7887,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
78877887
ifdef CONFIG_INTERNAL_SHA1
78887888
SHA1OBJS += ../src/crypto/sha1-internal.o
78897889
ifdef NEED_FIPS186_2_PRF
7890-
@@ -1546,29 +1587,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2
7890+
@@ -1551,29 +1592,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2
78917891
else
78927892
ifneq ($(CONFIG_TLS), openssl)
78937893
ifneq ($(CONFIG_TLS), wolfssl)
@@ -7925,7 +7925,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
79257925
ifdef NEED_MD5
79267926
ifdef CONFIG_INTERNAL_MD5
79277927
MD5OBJS += ../src/crypto/md5-internal.o
7928-
@@ -1623,12 +1672,17 @@ ifneq ($(CONFIG_TLS), openssl)
7928+
@@ -1628,12 +1677,17 @@ ifneq ($(CONFIG_TLS), openssl)
79297929
ifneq ($(CONFIG_TLS), linux)
79307930
ifneq ($(CONFIG_TLS), gnutls)
79317931
ifneq ($(CONFIG_TLS), wolfssl)
@@ -7943,7 +7943,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
79437943
ifdef CONFIG_INTERNAL_SHA256
79447944
SHA256OBJS += ../src/crypto/sha256-internal.o
79457945
endif
7946-
@@ -1641,50 +1695,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512
7946+
@@ -1646,50 +1700,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512
79477947
SHA256OBJS += ../src/crypto/sha512-internal.o
79487948
endif
79497949
ifdef NEED_TLS_PRF_SHA256
@@ -8012,7 +8012,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
80128012

80138013
ifdef NEED_ASN1
80148014
OBJS += ../src/tls/asn1.o
8015-
@@ -1859,10 +1931,12 @@ ifdef CONFIG_FIPS
8015+
@@ -1864,10 +1936,12 @@ ifdef CONFIG_FIPS
80168016
CFLAGS += -DCONFIG_FIPS
80178017
ifneq ($(CONFIG_TLS), openssl)
80188018
ifneq ($(CONFIG_TLS), wolfssl)

‎package/network/services/hostapd/patches/120-mbedtls-fips186_2_prf.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
1212

1313
--- a/hostapd/Makefile
1414
+++ b/hostapd/Makefile
15-
@@ -783,10 +783,6 @@ endif
15+
@@ -788,10 +788,6 @@ endif
1616
OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
1717
HOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
1818
SOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
@@ -101,7 +101,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
101101

102102
--- a/wpa_supplicant/Makefile
103103
+++ b/wpa_supplicant/Makefile
104-
@@ -1277,10 +1277,6 @@ endif
104+
@@ -1282,10 +1282,6 @@ endif
105105
OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
106106
OBJS_p += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
107107
OBJS_priv += ../src/crypto/crypto_$(CONFIG_CRYPTO).o

0 commit comments

Comments
 (0)