wlan-ap-Telecominfraproject/feeds/qca/hostapd/patches/b00-004-hostap-fix-compilation-issue.patch
John Crispin 008ca9618d
Some checks failed
Build OpenWrt/uCentral images / build (cig_wf186h) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf186w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf188n) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf189) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf196) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cybertan_eww631-a1) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cybertan_eww631-b1) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap101) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap102) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap104) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap105) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap111) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap112) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101-6e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101e-6e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_3) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xe) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xi) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xi_w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (indio_um-305ax) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sercomm_ap72tip) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630c-311g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630w-211g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630w-311g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (udaya_a6-id2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (udaya_a6-od2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr5018) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr6018) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr6018-v4) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_ax820) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_ax840) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap640) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap650) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap655) (push) Has been cancelled
Build OpenWrt/uCentral images / trigger-testing (push) Has been cancelled
Build OpenWrt/uCentral images / create-x64_vm-ami (push) Has been cancelled
ipq95xx: import ath12.4-cs kernel and drivers
Signed-off-by: John Crispin <john@phrozen.org>
2024-10-20 09:25:13 +02:00

155 lines
5.2 KiB
Diff

diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index a455fc6..c4c6bee 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -1117,7 +1117,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
mic_len, key_data_length);
wpa_hexdump(MSG_MSGDUMP,
"WPA: EAPOL-Key header (ending before Key MIC)",
- key, sizeof(*key));
+ (u8 *)key, sizeof(*key));
wpa_hexdump(MSG_MSGDUMP, "WPA: EAPOL-Key Key MIC",
mic, mic_len);
if (key_data_length > data_len - sizeof(*hdr) - keyhdrlen) {
@@ -3447,7 +3447,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
idx = bitfield_get_first_zero(wpa_auth->ip_pool);
if (idx >= 0) {
u32 start = WPA_GET_BE32(wpa_auth->conf.ip_addr_start);
- bitfield_set(wpa_auth->ip_pool, idx);
+ bitfield_set_local(wpa_auth->ip_pool, idx);
sm->ip_addr_bit = idx;
WPA_PUT_BE32(sm->ip_addr, start + idx);
wpa_printf(MSG_DEBUG,
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index fe38fa7..ded2954 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1149,7 +1149,7 @@ void * tls_init(const struct tls_config *conf)
if (conf && conf->openssl_ciphers)
ciphers = conf->openssl_ciphers;
else
- ciphers = TLS_DEFAULT_CIPHERS;
+ ciphers = "DEFAULT:!EXP:!LOW";
if (SSL_CTX_set_cipher_list(ssl, ciphers) != 1) {
wpa_printf(MSG_ERROR,
"OpenSSL: Failed to set cipher string '%s'",
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index 1531f51..726a92b 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -1688,7 +1688,7 @@ static int copy_peer_he_capab(const struct wpa_eapol_ie_parse *kde,
peer->he_capab_len = kde->he_capab_len;
wpa_hexdump(MSG_DEBUG, "TDLS: Peer HE capabilities",
- peer->he_capabilities, peer->he_capab_len);
+ (u8 *)peer->he_capabilities, peer->he_capab_len);
return 0;
}
@@ -1714,7 +1714,7 @@ static int copy_peer_he_6ghz_band_capab(const struct wpa_eapol_ie_parse *kde,
sizeof(struct ieee80211_he_6ghz_band_cap));
wpa_hexdump(MSG_DEBUG, "TDLS: Peer 6 GHz band HE capabilities",
- peer->he_6ghz_band_capabilities,
+ (u8 *)peer->he_6ghz_band_capabilities,
sizeof(struct ieee80211_he_6ghz_band_cap));
return 0;
diff --git a/src/utils/bitfield.c b/src/utils/bitfield.c
index 8dcec39..a6f30ef 100644
--- a/src/utils/bitfield.c
+++ b/src/utils/bitfield.c
@@ -37,7 +37,7 @@ void bitfield_free(struct bitfield *bf)
}
-void bitfield_set(struct bitfield *bf, size_t bit)
+void bitfield_set_local(struct bitfield *bf, size_t bit)
{
if (bit >= bf->max_bits)
return;
diff --git a/src/utils/bitfield.h b/src/utils/bitfield.h
index 7050a20..5c4b44f 100644
--- a/src/utils/bitfield.h
+++ b/src/utils/bitfield.h
@@ -13,7 +13,7 @@ struct bitfield;
struct bitfield * bitfield_alloc(size_t max_bits);
void bitfield_free(struct bitfield *bf);
-void bitfield_set(struct bitfield *bf, size_t bit);
+void bitfield_set_local(struct bitfield *bf, size_t bit);
void bitfield_clear(struct bitfield *bf, size_t bit);
int bitfield_is_set(struct bitfield *bf, size_t bit);
int bitfield_get_first_zero(struct bitfield *bf);
diff --git a/src/utils/utils_module_tests.c b/src/utils/utils_module_tests.c
index 365f21f..bfd37aa 100644
--- a/src/utils/utils_module_tests.c
+++ b/src/utils/utils_module_tests.c
@@ -142,7 +142,7 @@ static int bitfield_tests(void)
errors++;
if (i > 0 && bitfield_is_set(bf, i - 1))
errors++;
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
if (!bitfield_is_set(bf, i))
errors++;
bitfield_clear(bf, i);
@@ -155,7 +155,7 @@ static int bitfield_tests(void)
errors++;
if (i > 0 && bitfield_is_set(bf, i - 1))
errors++;
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
if (bitfield_is_set(bf, i))
errors++;
bitfield_clear(bf, i);
@@ -166,7 +166,7 @@ static int bitfield_tests(void)
for (i = 0; i < 123; i++) {
if (bitfield_is_set(bf, i) || bitfield_is_set(bf, i + 1))
errors++;
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
if (!bitfield_is_set(bf, i))
errors++;
}
@@ -182,7 +182,7 @@ static int bitfield_tests(void)
for (i = 0; i < 123; i++) {
if (bitfield_get_first_zero(bf) != i)
errors++;
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
}
if (bitfield_get_first_zero(bf) != -1)
errors++;
@@ -192,7 +192,7 @@ static int bitfield_tests(void)
bitfield_clear(bf, i);
if (bitfield_get_first_zero(bf) != i)
errors++;
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
}
if (bitfield_get_first_zero(bf) != -1)
errors++;
@@ -205,7 +205,7 @@ static int bitfield_tests(void)
if (bitfield_get_first_zero(bf) != 0)
errors++;
for (i = 0; i < 8; i++)
- bitfield_set(bf, i);
+ bitfield_set_local(bf, i);
if (bitfield_get_first_zero(bf) != -1)
errors++;
bitfield_free(bf);
diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c
index 238fe68..b3bbd47 100644
--- a/wpa_supplicant/rrm.c
+++ b/wpa_supplicant/rrm.c
@@ -1124,7 +1124,7 @@ static int wpas_rm_handle_beacon_req_subelem(struct wpa_supplicant *wpa_s,
}
for (i = 0; i < slen; i++)
- bitfield_set(data->eids, subelem[i]);
+ bitfield_set_local(data->eids, subelem[i]);
break;
case WLAN_BEACON_REQUEST_SUBELEM_AP_CHANNEL:
/* Skip - it will be processed when freqs are added */