mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
304423a4ff
Add patches:
- 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch
Remove upstreamed:
- 170-DPP-fix-memleak-of-intro.peer_key.patch
- 461-driver_nl80211-use-new-parameters-during-ibss-join.patch
- 800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch
- 992-openssl-include-rsa.patch
Automatically refreshed:
- 011-mesh-use-deterministic-channel-on-channel-switch.patch
- 021-fix-sta-add-after-previous-connection.patch
- 022-hostapd-fix-use-of-uninitialized-stack-variables.patch
- 030-driver_nl80211-rewrite-neigh-code-to-not-depend-on-l.patch
- 040-mesh-allow-processing-authentication-frames-in-block.patch
- 050-build_fix.patch
- 110-mbedtls-TLS-crypto-option-initial-port.patch
- 120-mbedtls-fips186_2_prf.patch
- 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch
- 150-add-NULL-checks-encountered-during-tests-hwsim.patch
- 160-dpp_pkex-EC-point-mul-w-value-prime.patch
- 200-multicall.patch
- 300-noscan.patch
- 310-rescan_immediately.patch
- 330-nl80211_fix_set_freq.patch
- 341-mesh-ctrl-iface-channel-switch.patch
- 360-ctrl_iface_reload.patch
- 381-hostapd_cli_UNKNOWN-COMMAND.patch
- 390-wpa_ie_cap_workaround.patch
- 410-limit_debug_messages.patch
- 420-indicate-features.patch
- 430-hostapd_cli_ifdef.patch
- 450-scan_wait.patch
- 460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
- 463-add-mcast_rate-to-11s.patch
- 465-hostapd-config-support-random-BSS-color.patch
- 500-lto-jobserver-support.patch
- 590-rrm-wnm-statistics.patch
- 710-vlan_no_bridge.patch
- 720-iface_max_num_sta.patch
- 730-ft_iface.patch
- 750-qos_map_set_without_interworking.patch
- 751-qos_map_ignore_when_unsupported.patch
- 760-dynamic_own_ip.patch
- 761-shared_das_port.patch
- 990-ctrl-make-WNM_AP-functions-dependant-on-CONFIG_AP.patch
Manually refresh:
- 010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
- 301-mesh-noscan.patch
- 340-reload_freq_change.patch
- 350-nl80211_del_beacon_bss.patch
- 370-ap_sta_support.patch
- 380-disable_ctrl_iface_mib.patch
- 464-fix-mesh-obss-check.patch
- 470-survey_data_fallback.patch
- 600-ubus_support.patch
- 700-wifi-reload.patch
- 711-wds_bridge_force.patch
- 740-snoop_iface.patch
Tested-by: Packet Please <pktpls@systemli.org> [Fritzbox 4040 (ipq40xx),
EAP225-Outdoor (ath79); 802.11s, WPA3 OWE, and WPA3 PSK]
Tested-by: Andrew Sim <andrewsimz@gmail.com> [mediatek/filogic]
Signed-off-by: Nick Hainke <vincent@systemli.org>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 33afce36c54b0cad38643629ded10ff5d727f077 Mon Sep 17 00:00:00 2001
|
|
From: Glenn Strauss <gstrauss@gluelogic.com>
|
|
Date: Fri, 12 Aug 2022 05:34:47 -0400
|
|
Subject: [PATCH 5/7] add NULL checks (encountered during tests/hwsim)
|
|
|
|
sae_derive_commit_element_ecc NULL pwe_ecc check
|
|
dpp_gen_keypair() NULL curve check
|
|
|
|
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
|
|
---
|
|
src/common/dpp_crypto.c | 6 ++++++
|
|
src/common/sae.c | 7 +++++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
--- a/src/common/dpp_crypto.c
|
|
+++ b/src/common/dpp_crypto.c
|
|
@@ -269,6 +269,12 @@ int dpp_get_pubkey_hash(struct crypto_ec
|
|
|
|
struct crypto_ec_key * dpp_gen_keypair(const struct dpp_curve_params *curve)
|
|
{
|
|
+ if (curve == NULL) {
|
|
+ wpa_printf(MSG_DEBUG,
|
|
+ "DPP: %s curve must be initialized", __func__);
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
struct crypto_ec_key *key;
|
|
|
|
wpa_printf(MSG_DEBUG, "DPP: Generating a keypair");
|
|
--- a/src/common/sae.c
|
|
+++ b/src/common/sae.c
|
|
@@ -1278,6 +1278,13 @@ void sae_deinit_pt(struct sae_pt *pt)
|
|
static int sae_derive_commit_element_ecc(struct sae_data *sae,
|
|
struct crypto_bignum *mask)
|
|
{
|
|
+ if (sae->tmp->pwe_ecc == NULL) {
|
|
+ wpa_printf(MSG_DEBUG,
|
|
+ "SAE: %s sae->tmp->pwe_ecc must be initialized",
|
|
+ __func__);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
|
|
if (!sae->tmp->own_commit_element_ecc) {
|
|
sae->tmp->own_commit_element_ecc =
|