]> git.ipfire.org Git - thirdparty/hostap.git/log
thirdparty/hostap.git
6 months agotests: Permit passing multiple valid tshark filters
Benjamin Berg [Mon, 6 Jan 2025 15:31:28 +0000 (17:31 +0200)] 
tests: Permit passing multiple valid tshark filters

It is useful to support different versions of tshark which may have
updated disectors. In that case, there may be no filter that works with
all version of tshark.

Permit passing multiple filters which will be tried in-order. This
allows first trying the filter for the newer version and then falling
back to an older filter in order to support different tshark versions.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
6 months agoP2P: Provide better failure reason for group formation errors
Emilio Cobos Álvarez [Mon, 6 Jan 2025 12:25:57 +0000 (13:25 +0100)] 
P2P: Provide better failure reason for group formation errors

I was playing with the DBUS P2P interface of wpa_supplicant, and it's
hard to know what's going on when you get a group formation failure with
empty messages, to the point I usually need to resort to debugging
wpa_supplicant itself.

Provide meaningful failure reasons for these errors.

Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
6 months agotests: External password (file) storage with partially matching keys
Joshua Manchester [Tue, 21 Jan 2025 19:38:48 +0000 (19:38 +0000)] 
tests: External password (file) storage with partially matching keys

Signed-off-by: Joshua Manchester <joshuamanchester4@gmail.com>
6 months agoext_password_file: Ensure full key match with password file entries
Joshua Manchester [Tue, 21 Jan 2025 19:38:47 +0000 (19:38 +0000)] 
ext_password_file: Ensure full key match with password file entries

When searching for a matching key in the external password file, strings
were only compared up to the length of the key in the file. This meant
searching for key "foo" could retrieve the incorrect password if keys
"f" or "fo" were defined earlier in the file.

Signed-off-by: Joshua Manchester <joshuamanchester4@gmail.com>
6 months agotests: Known STA Indentification
Jouni Malinen [Sat, 25 Jan 2025 17:32:01 +0000 (19:32 +0200)] 
tests: Known STA Indentification

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoSTA: Known STA Identification to skip association comeback mechanism
Jouni Malinen [Sat, 25 Jan 2025 17:36:11 +0000 (19:36 +0200)] 
STA: Known STA Identification to skip association comeback mechanism

Add a Known STA Identification element into (Re)Association Request
frame when using PMF with an AP with which we were last associated and
for which have stored the last used KCK in case that AP advertises
support for this capability to skip association comeback mechanism and
SA Query procedure.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoAP: Known STA Identification to skip association comeback mechanism
Jouni Malinen [Sat, 25 Jan 2025 17:32:50 +0000 (19:32 +0200)] 
AP: Known STA Identification to skip association comeback mechanism

Allow AP to skip association comeback mechanism and SA Query procedure
if a currently associated STA tries to (re)association again by
including a valid Known STA Identification element in the
(Re)Association Request frame. This capability is disabled by default
and can be enabled with known_sta_identification=1.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agotests: RADIUS and discarding invalid RADIUS messages
Jouni Malinen [Sat, 25 Jan 2025 09:32:11 +0000 (11:32 +0200)] 
tests: RADIUS and discarding invalid RADIUS messages

Signed-off-by: Jouni Malinen <j@w1.fi>
6 months agoRADIUS: Drop pending request only when accepting the response
Jouni Malinen [Sat, 25 Jan 2025 09:21:16 +0000 (11:21 +0200)] 
RADIUS: Drop pending request only when accepting the response

The case of an invalid authenticator in a RADIUS response could imply
that the response is not from the correct RADIUS server and as such,
such a response should be discarded without changing internal state for
the pending request. The case of an unknown response (RADIUS_RX_UNKNOWN)
is somewhat more complex since it could have been indicated before
validating the authenticator. In any case, it seems better to change the
state for the pending request only when we have fully accepted the
response.

Allowing the internal state of pending RADIUS request to change based on
responses that are not fully validation could have allow at least a
theoretical DoS attack if an attacker were to have means for injecting
RADIUS messages to the network using the IP address of the real RADIUS
server and being able to do so more quickly than the real server and
with the matching identifier from the request header (i.e., either by
flooding 256 responses quickly or by having means to capture the RADIUS
request). These should not really be realistic options in a properly
protected deployment, but nevertheless it is good to be more careful in
processing RADIUS responses.

Remove a pending RADIUS request from the internal list only when having
fully accepted a matching RADIUS response, i.e., after one of the
registered handlers has confirmed that the authenticator is valid and
processing of the response has succeeded.

Signed-off-by: Jouni Malinen <j@w1.fi>
6 months agotests: P2P2 invoke bootstrap comeback and pairing
Vinay Gannevaram [Wed, 22 Jan 2025 11:36:56 +0000 (17:06 +0530)] 
tests: P2P2 invoke bootstrap comeback and pairing

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Bootstrapping through wpas_p2p_prov_disc()
Vinay Gannevaram [Wed, 22 Jan 2025 10:04:15 +0000 (15:34 +0530)] 
P2P2: Bootstrapping through wpas_p2p_prov_disc()

Upper layer component can use separate calls for bootstrapping and
pairing. Add support for bootstrapping through wpas_p2p_prov_disc() and
pairing through wpas_p2p_connect() by skipping bootstrapping with input
parameter pd equals to 0.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agotests: Add provdisc parameter for P2P_CONNECT for P2P2 tests
Vinay Gannevaram [Wed, 22 Jan 2025 11:11:23 +0000 (16:41 +0530)] 
tests: Add provdisc parameter for P2P_CONNECT for P2P2 tests

For P2P2 connection, provdisc parameter in the P2P_CONNECT command is
used to initiate bootstrapping before pairing. Default enabling of
bootstrapping before pairing will be removed in a subsequent commit to
provide support for bootstrapping and pairing independently.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agotests: Update P2P2 pairing verification test to validate DIRA
Vinay Gannevaram [Fri, 24 Jan 2025 13:01:56 +0000 (18:31 +0530)] 
tests: Update P2P2 pairing verification test to validate DIRA

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Control interface command to validate DIRA info
Vinay Gannevaram [Sun, 19 Jan 2025 17:57:27 +0000 (23:27 +0530)] 
P2P2: Control interface command to validate DIRA info

Add a control interface command P2P_VALIDATE_DIRA to validate DIRA for
all the available Device Identity keys in the config file. Upper layer
components can use this to validate DIRA obtained from a peer in BLE
frames during BLE Assisted P2P R2 discovery.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Control interface command to get DIRA info of a P2P device
Vinay Gannevaram [Sun, 19 Jan 2025 17:22:27 +0000 (22:52 +0530)] 
P2P2: Control interface command to get DIRA info of a P2P device

Add a control interface command P2P_GET_DIRA to get DIRA nonce and tag
of a P2P device when pairing support is enabled. Upper layer components
can fetch DIRA info of a device and populate it in BLE frames for
BLE-Assisted P2P R2 Discovery.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Save the latest nonce and tag from a P2P USD discovery frame
Vinay Gannevaram [Sun, 19 Jan 2025 16:53:11 +0000 (22:23 +0530)] 
P2P2: Save the latest nonce and tag from a P2P USD discovery frame

During the P2P USD discovery, validate DIRA and store the valid nonce
and tag in the peer info structure. Upper layer components can identify
paired peer information with a new MAC address when valid nonce and tag
pair information is posted with device found event.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agowlantest: Parse Link Reconfiguration Request/Response
Jouni Malinen [Fri, 24 Jan 2025 18:25:19 +0000 (20:25 +0200)] 
wlantest: Parse Link Reconfiguration Request/Response

Learn additional link addresses when link reconfiguration is used to add
new links. This commit does not remove links or update group keys, i.e.,
only the minimal case of adding new links is covered to allow unicast
frames on the new links to be decrypted.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agowlantest: Parse Extended MLD Capabilities And Operations in Common Info
Jouni Malinen [Fri, 24 Jan 2025 16:22:36 +0000 (18:22 +0200)] 
wlantest: Parse Extended MLD Capabilities And Operations in Common Info

Show the value in a clearer debug print instead of the generic "Extra
information at the end of Common Info".

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoAP MLD: Skip over Extended MLD Capabilities And Operations field
Adil Saeed Musthafa [Wed, 22 Jan 2025 08:57:08 +0000 (00:57 -0800)] 
AP MLD: Skip over Extended MLD Capabilities And Operations field

Skip over the Extended MLD Capabilities And Operations field in the
Common Info field of the Basic Multi-Link element so that processing of
the information after the Common Info field can continue from the
correct offset.

Signed-off-by: Adil Saeed Musthafa <quic_adilm@quicinc.com>
6 months agotests: Succeed P2P group removal test if SSIDs happen to match
Benjamin Berg [Sun, 19 Jan 2025 07:48:46 +0000 (09:48 +0200)] 
tests: Succeed P2P group removal test if SSIDs happen to match

The test would fail in the unlikely event that the two SSIDs were the
same. Fix this by detecting the case and simply changing the expected
value (as the old entry will have been overwritten).

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
6 months agotests: Increase default go_neg_pbc timeout to 30 s
Benjamin Berg [Wed, 22 Jan 2025 11:14:19 +0000 (13:14 +0200)] 
tests: Increase default go_neg_pbc timeout to 30 s

Occasionally, the two device simply cannot find themselves within the 15
seconds (20 s - 5 s). Increase the default timeout to avoid random test
failures.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
6 months agoDo not write mesh_fwding network parameter if it has default value
Jouni Malinen [Fri, 24 Jan 2025 08:48:06 +0000 (10:48 +0200)] 
Do not write mesh_fwding network parameter if it has default value

This is set to 1 by default but the condition for writing it into the
configuration file used 0 as the default. Make these match so that there
won't be confusing entries in network block for cases that do not have
anything to do with mesh.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agotests: wpa_supplicant configuration parameter p2p2_client_list
Jouni Malinen [Fri, 24 Jan 2025 08:47:37 +0000 (10:47 +0200)] 
tests: wpa_supplicant configuration parameter p2p2_client_list

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agotests: Update P2P_INVITE parameters for P2P2 reinvoke
Vinay Gannevaram [Sat, 11 Jan 2025 06:44:34 +0000 (12:14 +0530)] 
tests: Update P2P_INVITE parameters for P2P2 reinvoke

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Update P2P_INVITE processing for SSID randomization
Vinay Gannevaram [Sat, 11 Jan 2025 06:08:10 +0000 (11:38 +0530)] 
P2P2: Update P2P_INVITE processing for SSID randomization

With SSID randomization for P2P2 group reinvocation, the control
interface command P2P_INVITE requires the peer device address to be
present, but the network id is not required.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: SSID randomization on group reinvoke
Vinay Gannevaram [Sat, 11 Jan 2025 06:08:10 +0000 (11:38 +0530)] 
P2P2: SSID randomization on group reinvoke

P2P R2 allows the GO to randomize SSID and Group BSSID when a group is
reinvoked. Add support to fetch the group details based on the device
identity block info of the peer with which the group reinvoke is
initiated. As the previous SSID of the network is no longer valid, fetch
the network details based on the ID of the device identity block.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P: Make p2p_build_ssid() available outside src/p2p
Vinay Gannevaram [Sat, 11 Jan 2025 06:08:10 +0000 (11:38 +0530)] 
P2P: Make p2p_build_ssid() available outside src/p2p

This is needed for SSID randomization during P2P2 group reinvocation.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Store ID of Device Identity block in network block
Vinay Gannevaram [Sat, 11 Jan 2025 05:50:11 +0000 (11:20 +0530)] 
P2P2: Store ID of Device Identity block in network block

Each peer's Device Identity key is unique, while Group SSID, P2P Device
Addresses, and P2P Interface addresses can be randomized. Add support to
map the GO or P2P2 client information of a network block with the
identifier of the Device Identity block. On a P2P Device with the role
of a client, store the ID of the GO in go_dik_id, and on a device with
the role of GO, store the IDs of P2P clients in a list.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Add USD service hash in the P2P2 PASN M1 frame
Shivani Baranwal [Mon, 6 Jan 2025 06:09:35 +0000 (11:39 +0530)] 
P2P2: Add USD service hash in the P2P2 PASN M1 frame

Add USD service hash in PASN M1 authentication frame for the P2P GO
negotiation and P2P verification cases. This can help a P2P Device that
operates multiple GOs to select which group a peer device should be
added to.

Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>
6 months agoP2P2: Random PMKID in pairing verification
Jouni Malinen [Tue, 24 Dec 2024 07:08:30 +0000 (12:38 +0530)] 
P2P2: Random PMKID in pairing verification

Enable pairing verification using a random PMKID after the DIRA
validation in the PASN frame is successful.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Return ID of identity block for p2p_validate_dira()
Jouni Malinen [Fri, 27 Dec 2024 14:07:30 +0000 (19:37 +0530)] 
P2P2: Return ID of identity block for p2p_validate_dira()

Start the identity block ID from a non-zero value and return the ID on
successful DIRA validation. This is used to process invitation request
and handle random SSID by group owner which will be covered in separate
commits.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoP2P2: Add DIRA to PASN-M1 during pairing verification
Jouni Malinen [Fri, 27 Dec 2024 14:00:59 +0000 (19:30 +0530)] 
P2P2: Add DIRA to PASN-M1 during pairing verification

This is needed to be able to recognize a peer device and its PMKSA entry
when a random PMKID is used with MAC address randomization.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agotests: Fix to set P2P2 configuration for added wpa_supplicant instance
Jouni Malinen [Tue, 24 Dec 2024 09:41:19 +0000 (15:11 +0530)] 
tests: Fix to set P2P2 configuration for added wpa_supplicant instance

Set P2P2 configyration to the dynamically added wpa_supplicant instance
to advertise support for pairing setup and pairing cache enable.

Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
6 months agoOWE: Consider the currently associated transition mode SSID known
Ben Lai [Fri, 27 Dec 2024 06:13:38 +0000 (14:13 +0800)] 
OWE: Consider the currently associated transition mode SSID known

When the BSS table size limit is reached the oldest unknown BSS entry is
removed when needing to add a new BSS. This could have resulted in use
of freed memory before wpa_bss_remove_oldest_unknown() was extended to
use wpa_bss_in_use() as a condition for removing a BSS entry. Even with
that issue addressed, it is better to recognize BSS entries that match
the current network profiles SSID in cases where that match is through
the OWE transition mode mechanism. This avoids removing entries that
might be used finding a better BSS.

Signed-off-by: Sunil Ravi <sunilravi@google.com>
6 months agotests: OWE transition mode and oldest unknown BSS entry removal
Jouni Malinen [Tue, 21 Jan 2025 17:38:05 +0000 (19:38 +0200)] 
tests: OWE transition mode and oldest unknown BSS entry removal

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoDo not remove a currently used BSS entry when removing oldest unknown BSS
Jouni Malinen [Tue, 21 Jan 2025 17:34:23 +0000 (19:34 +0200)] 
Do not remove a currently used BSS entry when removing oldest unknown BSS

wpa_bss_known() might not be sufficient to catch all cases where a BSS
entry is in use. One known example of such a case is OWE transition mode
where the SSID of the transition mode AP is not the same as the one in
the local network profile. Some other cases might exists as well.

If the oldest unknown BSS needs to be removed due to running out of room
in the BSS table and that removed BSS happens to be the currently
associated one, wpa_s->current_bss might become invalid and point to
freed memory. This needs to be avoided to prevent use of freed memory,
so use wpa_bss_in_use() as an extra condition for removing the oldest
unknown BSS.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agonl80211: Fix compilation error when CONFIG_DRIVER_NL80211_BRCM is enabled
Sunil Ravi [Wed, 8 Jan 2025 18:49:27 +0000 (18:49 +0000)] 
nl80211: Fix compilation error when CONFIG_DRIVER_NL80211_BRCM is enabled

wpa_driver_do_broadcom_acs() does not use the bss variable, so it should
not have been converted from nl80211_drv_msg() to nl80211_msg_bss().
Revert that part of the earlier changes to fix compilation.

Fixes: e3fe940ac2ce ("nl80211: Use nl80211_bss_msg() helper wherever BSS is accessible")
Signed-off-by: Sunil Ravi <sunilravi@google.com>
6 months agoEnable beacon protection if IEEE 802.11be/EHT is enabled for BSS
Jurijs Soloveckis [Mon, 25 Mar 2024 13:23:12 +0000 (13:23 +0000)] 
Enable beacon protection if IEEE 802.11be/EHT is enabled for BSS

IEEE P802.11be/D7.0, 12.12.9 (Security constraints for EHT) mandates
beacon protection to be enabled in EHT AP when using RSN. Do this
automatically even if beacon_prot=1 is not included in the
configuration.

Signed-off-by: Jurijs Soloveckis <jsoloveckis@maxlinear.com>
6 months agoDPP: Discard DPP Action frame in AP mode if no global DPP context
Hu Wang [Mon, 6 Jan 2025 03:23:41 +0000 (19:23 -0800)] 
DPP: Discard DPP Action frame in AP mode if no global DPP context

For AP mode in wpa_supplicant, e.g., for P2P GO interfaces, the global
DPP context does not exist support DPP functionality and this could
result in dereferencing a NULL pointer in wpa_supplicant if an
unexpected frame is received. Discard the received DPP Action frames in
such cases instead of trying to process them.

Fixes: e00f780e2bdd ("DPP2: hostapd as TCP Relay")
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoRSNO: Generate IGTK if any of the RSN variants has PMF enabled
Sai Pratyusha Magam [Fri, 3 Jan 2025 05:53:22 +0000 (11:23 +0530)] 
RSNO: Generate IGTK if any of the RSN variants has PMF enabled

With RSN overriding enabled, AP can be configured to set MFPC to 0 and
MFPR to 0 in the RSNE and MFPC to 1 and MFPR to 1 in the RSNOE and
RSNO2E. IGTK generation, configuration to the driver, and inclusion of
the IGTK KDE in 4-way handshake should also take into account the
management frame protection settings in the override variants.

Signed-off-by: Sai Pratyusha Magam <quic_smagam@quicinc.com>
6 months agoAdd QCA vendor attribute for BTM reject support
Gururaj Pandurangi [Tue, 7 Jan 2025 01:17:44 +0000 (17:17 -0800)] 
Add QCA vendor attribute for BTM reject support

Add a vendor attribute for a testbed STA to configure firmware to reject
AP's BSS Transition Management (BTM) request frame by sending a BTM
response with error status code.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoAdd QCA vendor attribute for extra EHT-LTF support
Gururaj Pandurangi [Tue, 7 Jan 2025 01:16:24 +0000 (17:16 -0800)] 
Add QCA vendor attribute for extra EHT-LTF support

Add vendor attribute for EHT testbed STA to configure the extra EHT-LTF
in the EHT capabilities of an Association Request frame.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
6 months agoAdd QCA vendor attribute for triggered SU BF support
Gururaj Pandurangi [Tue, 7 Jan 2025 01:14:04 +0000 (17:14 -0800)] 
Add QCA vendor attribute for triggered SU BF support

Add vendor attribute for EHT testbed STA to configure the triggered
single user beamforming feedback in the EHT capabilities of an
Association Request frame.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
7 months agoEAP-TEAP: Add a compatibility mode for FreeRADIUS
Jouni Malinen [Wed, 1 Jan 2025 09:17:31 +0000 (11:17 +0200)] 
EAP-TEAP: Add a compatibility mode for FreeRADIUS

FreeRADIUS (at least the current snapshot of the v3.2.x branch) uses
different style for deriving S-IMCK[j]. It tracks S_IMCK_MSK[j] and
S_IMCK_EMSK[j] variants through all inner methods instead of selecting a
single S_IMCK[j] at the end of each inner method. IMHO, that does not
match what is most likely described in RFC 7170bis, it is a potential
interpretation of the draft and is closer to what wpa_supplicant used to
do earlier. However, that design has a weakness in EMSK derivation from
TEAP since it does not actually get any input from inner methods that do
not derive an EMSK.

Obviously, there should be only a single shared interpretation on how
TEAPv1 is supposed to work, but until we get to that point, it is
convenient to be able to test other parts of the protocol without having
to modify source code to work around differences. Introduce a new
phase1="teap_compat=freeradius" configuration parameter to
wpa_supplicant to allow EAP-TEAP peer behavior to be modified to match
what FreeRADIUS expects.

This compatibility mode was now able to successfully authenticate (and
also to derive matching MSK and EMSK) against FreeRADIUS v3.2.x branch
snapshot with all four combinations of machine(EAP-TLS) and
user(EAP-MSCHAPv2) authentication.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoEAP-TEAP: Fix S-IMCK derivation based on RFC 7170bis
Jouni Malinen [Tue, 31 Dec 2024 18:07:09 +0000 (20:07 +0200)] 
EAP-TEAP: Fix S-IMCK derivation based on RFC 7170bis

draft-ietf-emu-rfc7170bis-19 has clarified some of the operations
related to how keys are derived in EAP-TEAP. Update hostapd and
wpa_supplicant implementations to match this.

Derive S-IMCK_MSK[j] for Basic-Password-Auth using 32 octet all zeros
MSK. This was already done in the previous implementation, but this
updates that design to use the common S-IMCK/CMK derivation helper
function.

While there are two variants of IMSK, S-IMCK, and CMK being derived afte
r reach inner method, only one of those variants are selected based on
which MSK/EMSK combinations are supported by the server and the client.
This is not completely clear in Section 5.2, but the rules there for the
"received of the Crypto-Binding TLV" (which is really talking about the
EAP client, not server when the server is receiving Client-Binding TLV
from the client) seem to imply this design.

The design for crypto bindings and selection on MSK vs. EMSK related
keys as follows: Both the server and the client derive CMK_MSK[j] and
CMK_EMSK[j], if possible (i.e., if their implementation of the inner
method derived those keys). The server includes both MSK Compound MAC
and EMSK Compound MAC (if both MSK and EMSK were derived by the inner
method). The client selects which one of these to use based on what its
implementation of the inner method derived. The client includes only one
of these (i.e., EMSK Compound MAC if both the server and the client
derived EMSK or MSK Compound MAC otherwise). This determines which of
the S-IMCK[j] variants (i.e., S-IMCK_MSK[j] or S-IMCK_EMSK[j]) is
selected to be used as the S-IMCK[j].

With the clarified selection of a single S-IMCK[j] after each inner
method, the unclear parts about overall MSK/EMSK derivation from TEAP is
clarified since there is not actually need to explicitly indicate
variant of S-IMCK[n] is used.

In addition, this removes FIX comments for the cases that were clarified
in the draft to match what was previously implemented (e.g., fixed 20
octet length for Compound MAC).

These changes are not backwards compatible. Some cases might work, but
more or less everything with more than a single inner method is going to
fail between the previous and the new implementation. Taken into account
the limited deployment of EAP-TEAP so far and the work to clarify things
in RFC 7170bis, there is enough justification for this compatibility
breaking change at this point.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agotests: Avoid which -s since not all which implementations have it
Jouni Malinen [Mon, 30 Dec 2024 16:55:34 +0000 (18:55 +0200)] 
tests: Avoid which -s since not all which implementations have it

Apparently it was too good to be true that one could have used which
without having to direct stdout to /dev/null.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoWNM: A more explicit check for a connection
Jouni Malinen [Mon, 30 Dec 2024 16:31:21 +0000 (18:31 +0200)] 
WNM: A more explicit check for a connection

wnm_scan_process() was only implicitly verifying that there is an
association based on wpa_s->wnm_dialog_token having been set. While that
may be sufficient for normal uses within wpa_supplicant, this was not
covered in a separate WNM fuzzer. Add an explicit check for
wpa_s->current_ssid to be set within wnm_scan_process() to avoid
unexpected behavior if something were to allow wnm_dialog_token to be
set when not actually associated.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agotests: Fix WNM fuzzzer to work with wnm_sta.c changes
Jouni Malinen [Mon, 30 Dec 2024 16:29:25 +0000 (18:29 +0200)] 
tests: Fix WNM fuzzzer to work with wnm_sta.c changes

wpa_s->current_ssid needs to be set for processing BSS transition
management operations now witht he wnm_san_process() changes to use
wpa_supplicant_select_bss(), so set that in the WNM fuzzer to avoid
false errors due to dereferencing a NULL pointer.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoMBO: Get rid of the is_first flag in neighbor report array
Jouni Malinen [Sun, 29 Dec 2024 10:11:25 +0000 (12:11 +0200)] 
MBO: Get rid of the is_first flag in neighbor report array

This was set to 1 for the entry at position 0 if
wnm_mbo_trans_reason_present is set. The flag was used only under that
condition and the array position is known, so it is simpler to just use
that without an explicit flag indicating which entry is first.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoWNM: Use standard BSS selection and enable abridged bit handling
Benjamin Berg [Thu, 19 Sep 2024 10:19:17 +0000 (12:19 +0200)] 
WNM: Use standard BSS selection and enable abridged bit handling

Most of the logic to reject BSSs during transition has been moved into
wnm_is_bss_excluded(). In addition to this, since commit 67bf89f55442
("WNM: Choose the best available BSS, not just the first one") we will
simply choose the BSS with the best throughput.

Overall, this matches the behavior that wpa_supplicant will use anyway
in wpa_supplicant_select_bss(). The only bigger difference is that using
this will check all known BSSs instead of only the ones in the candidate
list. This means that with this change the abridged bit is handled
according to standard.

There are some subtle changes to the logic. One is, that candidates with
a very low signal level are not explicitly dropped anymore. However,
that code pre-dates the logic to prefer the best BSS and should not be
relevant anymore.

Another small adjustment is to change the custom logic to avoid roaming
when it is not needed to use wpa_supplicant_need_to_roam_within_ess().

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
7 months agoWNM: Fix pre-scan rejection heuristic for BTM handling
Benjamin Berg [Thu, 19 Sep 2024 10:19:16 +0000 (12:19 +0200)] 
WNM: Fix pre-scan rejection heuristic for BTM handling

The idea was to only accept the cached scan results if the new target is
reasonably good. To avoid having to write a custom quality logic, a call
to wpa_supplicant_need_to_roam_within_ess() was used. However, the
intention was to swap the parameters and check whether we would want to
roam from the new BSS back to the current one.

Fix the heuristic to match the comment. To do that, we need to add a
parameter to not poll the current signal level as that would result in
comparing the current BSS with itself within the function.

Fixes: 20ed289a785c ("WNM: Clean up old scan data processing")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
7 months agotests: get_bss_transition_status() driver op
Benjamin Berg [Thu, 19 Sep 2024 10:19:15 +0000 (12:19 +0200)] 
tests: get_bss_transition_status() driver op

Add some testing coverage for the BSS transition candidate processing by
the driver for MBO.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
7 months agoWNM: Move driver MBO transition rejection into wnm_is_bss_excluded()
Benjamin Berg [Thu, 19 Sep 2024 10:19:15 +0000 (12:19 +0200)] 
WNM: Move driver MBO transition rejection into wnm_is_bss_excluded()

Change the logic a bit to not directly use the result of the
wpa_drv_get_bss_trans_status() call and instead use the same selection
logic as usual but taking into account the driver rejections.

This changes the logic in minor ways. The main change is that this
aligns the ordering of BSSs to be identical in all cases. More
precisely, we'll select the best BSS as found by find_better_target().

Beyond that, it also means that in the case of an non-abridged BTM
request we'll also consider candidates that were found through the scan
and not in the neighbor report. In this case, the driver will not have a
chance to reject them.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
7 months agoEAP-TEAP: Remove deprecated PAC support
Jouni Malinen [Sat, 28 Dec 2024 08:58:19 +0000 (10:58 +0200)] 
EAP-TEAP: Remove deprecated PAC support

RFC 7170bis deprecates use of PAC and there are no known deployments of
it, so remove this functionality completely.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoClear the pending EAPOL RX on disconnection
Jouni Malinen [Fri, 27 Dec 2024 21:51:55 +0000 (23:51 +0200)] 
Clear the pending EAPOL RX on disconnection

Avoid any potentially unexpected behavior if the postponed EAPOL RX
could end up being processed in a different association that the one in
which the frame was postponed.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoWPS: Fix a race condition on WPS_CANCEL handling
Jouni Malinen [Fri, 27 Dec 2024 21:49:57 +0000 (23:49 +0200)] 
WPS: Fix a race condition on WPS_CANCEL handling

If the WPS_CANCEL command were issued between the driver command
requesting association and the driver event indicating completion of
association, i.e., within the WPA_ASSOCIATING state, it was possible for
the association to continue and the WPS procedure to be completed after
this.

Address this by forcing deauthentication and WPS state clearing also in
the WPS_ASSOCIATING state and not only if the association has been
completed.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoUse BSS-specific ACL configuration when setting up driver-based ACL
Jouni Malinen [Fri, 27 Dec 2024 21:23:15 +0000 (23:23 +0200)] 
Use BSS-specific ACL configuration when setting up driver-based ACL

This capability was originally added with only the entries from the
first BSS being supported likely due to the target use case not actually
using the multiple BSSs with a single radio. However, there does not
seem to be any specific reason for such constraint, so change this to
use the current BSS's own configuration instead of the first BSS's to
support per-BSS configuration with driver-based ACL.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoMBSSID: Allow BSS Index and maximum number of BSSs to be configured
Baligh Gasmi [Wed, 11 Dec 2024 20:37:38 +0000 (21:37 +0100)] 
MBSSID: Allow BSS Index and maximum number of BSSs to be configured

Configuring hostapd's BSSs with a custom BSSID via the `bssid` parameter
in the config file can lead to a misconfigured Multiple BSSID element
consequently leading to stations failing to calculate the correct BSSID
for non-transmitting BSSs, as specified in IEEE Std 802.11-2020,
9.4.2.45.

To ensure consistency, the configuration need to include critical
parameters: `MaxBSSID Indicator` and `Multiple BSSID Index` to customize
the Multiple BSSID element following the custom BSSIDs as well.

Add a new global parameter, `mbssid_max`, to set the `MaxBSSID
Indicator` and a per-BSS parameter, `mbssid_index`, to explicitly set
the `Multiple BSSID Index`. If these are not set, the previous behavior
of determining these values automatically is maintained (with its limits
to dynamic addition of BSSs to a Multiple BSSID set).

Signed-off-by: Baligh Gasmi <gasmibal@gmail.com>
7 months agotests: Run mbo_assoc_disallow in the beginning of UML VM
Jouni Malinen [Fri, 27 Dec 2024 20:48:13 +0000 (22:48 +0200)] 
tests: Run mbo_assoc_disallow in the beginning of UML VM

This test case could take significant amount of time in some cases when
run after large number of other test cases with UML. This might be due
to multiple tshark operations that seemed to suffer from some resource
issues with UML time travel.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoDo not add extra IEs to scan request if they do not fit driver limit
Jouni Malinen [Fri, 27 Dec 2024 20:36:29 +0000 (22:36 +0200)] 
Do not add extra IEs to scan request if they do not fit driver limit

For now, each separate IE is being checked on its own, so this is not a
complete check on the total length, but a useful step in avoiding some
known issues with drivers that do not support any IEs being added. A
more complete validation would need rules on determining which IE is of
higher priority than the other ones, but that might not be needed unless
there are drivers that have nonzero, but still quite small, limit on
extra IEs.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agonl80211: Fetch maximum length of extra IE(s) for Probe Request frames
Jouni Malinen [Fri, 27 Dec 2024 18:43:42 +0000 (20:43 +0200)] 
nl80211: Fetch maximum length of extra IE(s) for Probe Request frames

This can be helpful in determining which IE(s) to add to Probe Request
frames in scan commands based on driver capabilities.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agotests: SAE and DUMP_BEACON
Jouni Malinen [Fri, 27 Dec 2024 18:32:12 +0000 (20:32 +0200)] 
tests: SAE and DUMP_BEACON

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoIntroduce DUMP_BEACON command
Marek Puzyniak [Wed, 9 Oct 2024 08:15:02 +0000 (10:15 +0200)] 
Introduce DUMP_BEACON command

Occasionally, external applications require information about AP
configurations and capabilities. One potentially useful source for this
is the Beacon frame content. To support this need, introduce a new
control interface command: DUMP_BEACON. This return a hexdump of the
Beacon frame template, i.e., IEEE 802.11 frame header and frame body
with the TIM element missing since it is added by the driver and some of
the fields like the Timestamp field left to all zeros since they will be
filled in by the driver/hardware.

This can be fetched with hostapd_cli:

hostapd_cli -i wlxxx raw DUMP_BEACON
80000000ffffffffffff...
7f080400000200000040dd180050f2020101010003a4000027a4000042435e0062322f00

Signed-off-by: Marek Puzyniak <marek.puzyniak@holisticon.pl>
7 months agotests: Make WPS protocol tests for credential processing more robust
Jouni Malinen [Fri, 27 Dec 2024 17:50:07 +0000 (19:50 +0200)] 
tests: Make WPS protocol tests for credential processing more robust

Clear the scan cache at the beginning of these test cases to avoid
issues with WPS_PBC and WPS_PIN commands if there were to be an old scan
result from a previous test case with the same BSSID.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoEAP-TEAP: Don't complain about missing PAC when teap_provisioning=0
Alan T. DeKok [Sat, 21 Dec 2024 11:49:54 +0000 (06:49 -0500)] 
EAP-TEAP: Don't complain about missing PAC when teap_provisioning=0

If we're not provisioning, then we don't need the PAC.

RFC 7170bis officially deprecates the PAC, and it doesn't
appear that other TEAP implementations use it.

Signed-off-by: Alan DeKok <aland@freeradius.org>
7 months agoCheck last scan SSIDs before triggering new scan for hidden network
Arowa Suliman [Tue, 5 Nov 2024 05:36:11 +0000 (05:36 +0000)] 
Check last scan SSIDs before triggering new scan for hidden network

Commit 92374d59d4ef ("Enhance select_network() to trigger new scans in
some cases") introduced a redundant scan when selecting a hidden network
that was previously scanned and found. This occurs because the code only
checks for the condition `(wpa_s->no_suitable_network ||
wpa_s->last_scan_external)`, which doesn't cover the case where the last
scan successfully found the hidden SSID.

Save the scanned SSIDs from the last scan and updates the condition to
check if the hidden SSID was included. If the hidden SSID is not found
in `last_scan_ssids`, the code checks if the SSID was found in earlier
scan results. If not, it triggers a new scan. If the SSID is found, a
new scan is avoided, resulting in faster connection times.

Signed-off-by: Arowa Suliman <arowa@chromium.org>
7 months agoUpdate link to prplMesh repository
Jouni Malinen [Thu, 26 Dec 2024 22:34:00 +0000 (00:34 +0200)] 
Update link to prplMesh repository

The older github.com repository has been archived.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoHandle CONFIG_NO_WPA for wpa_sm_has_ptk_installed()
Jouni Malinen [Thu, 26 Dec 2024 22:19:33 +0000 (00:19 +0200)] 
Handle CONFIG_NO_WPA for wpa_sm_has_ptk_installed()

There was no empty wrapper for wpa_sm_has_ptk_installed() for the
CONFIG_NO_WPA=y builds. The previously renamed wpa_sm_has_ptk() wrapper
was still in place even though it is not used anymore, so rename it to
cover this newer need.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agomka: Accept MKPDU sent to any multicast address
Tim Small [Wed, 23 Oct 2024 16:35:02 +0000 (17:35 +0100)] 
mka: Accept MKPDU sent to any multicast address

Improve MKPDU 802.1X conformance by not requiring the PAE group address
(01-80-C2-00-00-03) to be used as the destination, but instead, allowing
any multicast address to be used. IEEE Std 802.1X-2020, 11.11.2
(Validation of MKPDUs) disallows only individual addresses as the
destination address.

IEEE Sts 802.1X-2010 and 802.1X-2020 both specify that MKPDU packets
should be discarded if their destination address is "an individual
address". ieee802_1x_kay_mkpdu_validity_check() previously also rejected
all destination addresses other than 01:80:c2:00:00:03 "Nearest non-TPMR
Bridge group address" (in contradiction to its comments).

This restriction may be a carry-over from IEEE Std 802.1X-2004, but is
explicitly discouraged in the 2010 and 2020 revisions (see 11.1.1
(Destination MAC address) and its references).

The additional restriction prevented wpa_supplicant and hostapd from
participating in MACsec communication in environments such as
third-party ("supplier") layer 2 networks.

Signed-off-by: Tim Small <tim@seoss.co.uk>
7 months agotests: Make ap_cipher_tkip_countermeasures_sta2 more robust
Jouni Malinen [Thu, 26 Dec 2024 18:30:23 +0000 (20:30 +0200)] 
tests: Make ap_cipher_tkip_countermeasures_sta2 more robust

Work around a race condition between Michael MIC error report processing
on the AP from two STAs and the 4-way handshake that might get started,
but not necessarily completed, during that window.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoOWE: Fix SSID comparison in transition mode case
Vinayak Yadawad [Fri, 13 Dec 2024 08:45:27 +0000 (14:15 +0530)] 
OWE: Fix SSID comparison in transition mode case

ret_ssid is a pointer to a pointer to the SSID and as such, it needs to
be referenced once here for the comparison just like ret_ssid_len. This
was broken recently as a part of duplicated code removal.

Fixes: ddfed3f08473 ("OWE: Reduce code duplication in OWE element parsing")
Signed-off-by: Vinayak Yadawad <vinayak.yadawad@broadcom.com>
7 months agotests: Opportunistic Wireless Encryption transition mode roaming
Jouni Malinen [Thu, 26 Dec 2024 10:14:25 +0000 (12:14 +0200)] 
tests: Opportunistic Wireless Encryption transition mode roaming

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoOWE: Accept only BSS entries with an actual SSID for ROAM command
Jouni Malinen [Thu, 26 Dec 2024 10:30:22 +0000 (12:30 +0200)] 
OWE: Accept only BSS entries with an actual SSID for ROAM command

An AP in OWE transition mode shows up in the BSS table twice due to use
of the hidden SSID. Since roaming requires the SSID to be known, don't
select the BSS entry with an empty SSID to force the one with the actual
SSID to be used when using the ROAM command to roam between APs that
might use OWE transition mode.

Fixes: 56e8f8bf3490 ("OWE: Enable roaming between OWE APs")
Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agonl80211: Use wpa_msg() to report netlink errors
Ben Greear [Wed, 10 Jul 2024 18:37:11 +0000 (11:37 -0700)] 
nl80211: Use wpa_msg() to report netlink errors

This allows errors to be propagated to listeners instead of
just buried in the logs.

Signed-off-by: Ben Greear <greearb@candelatech.com>
7 months agonl80211: Make drv pointer available to send_and_recv()
Ben Greear [Wed, 10 Jul 2024 18:37:11 +0000 (11:37 -0700)] 
nl80211: Make drv pointer available to send_and_recv()

This is needed to allow wpa_msg() to be used to report kernel errors.

Signed-off-by: Ben Greear <greearb@candelatech.com>
7 months agohostapd: Respect obss_interval on 40 MHz intolerant disconnect
Nicolas Escande [Mon, 29 Apr 2024 10:13:25 +0000 (12:13 +0200)] 
hostapd: Respect obss_interval on 40 MHz intolerant disconnect

When an AP is configured for HT operation on 40 MHz but has overlapping
BSS on the secondary channel, it will fall back to 20 MHz only. Also a
40 MHz AP will downgrade to 20 MHz while at least one 40 MHz intolerant
STA is connected.

However, in the current code, on such an AP, we do not check the
obss_interval parameter to be set on the last 40 MHz intolerant STA
disconnect and instead, start a timer that will unconditionnaly and
immediately bring the AP to 40 MHz operation even if it had overlapping
BSS.

A similar case was addressed for the 20/40 MHz co-ex report earlier in
commit d027c7b118fe ("Fix 20/40 MHz co-ex report processing with
obss_interval=0"), but this other case that gets called whenever a STA
entry is removed needs to have similar constraint on starting the timer.

Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
7 months agotests: Set obss_interval for the test that verifies return to 40 MHz
Jouni Malinen [Wed, 25 Dec 2024 17:11:11 +0000 (19:11 +0200)] 
tests: Set obss_interval for the test that verifies return to 40 MHz

This is in preparation for changing hostapd to require obss_interval to
be set to allow the channel bandwidth to be increased from 20 MHz to 40
MHz on disassociation of the last 40 MHz intolerant STA.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agotests: Enable NAN_USD hwsim tests
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:20 +0000 (11:10 +0200)] 
tests: Enable NAN_USD hwsim tests

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agotests: Add a couple of P2P2 pairing tests with P2P device
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:19 +0000 (11:10 +0200)] 
tests: Add a couple of P2P2 pairing tests with P2P device

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agotests: Support parsing group formation events without password
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:18 +0000 (11:10 +0200)] 
tests: Support parsing group formation events without password

P2P2 clients don't acquire group password with PASN SAE pairing. Support
parsing GROUP-STARTED events without password.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agotests: Properly cancel NAN publish/subscribe
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:17 +0000 (11:10 +0200)] 
tests: Properly cancel NAN publish/subscribe

Wrong command was used. Fix it.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agotests: Use global interface for P2P2 tests
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:16 +0000 (11:10 +0200)] 
tests: Use global interface for P2P2 tests

These commands should be redirected to P2P device interace, thus use
global interface both for USD and pairing commands.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoP2P2: Use global interface for USD
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:15 +0000 (11:10 +0200)] 
P2P2: Use global interface for USD

Redirect NAN USD command and events to global interface, so it can be
used for P2P.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agonl80211: Allow PASN Authentication frames on P2P device interface
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:14 +0000 (11:10 +0200)] 
nl80211: Allow PASN Authentication frames on P2P device interface

This is required for PASN based pairing used in P2P2.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoP2P2: Fix frequency selection for auto GO join
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:13 +0000 (11:10 +0200)] 
P2P2: Fix frequency selection for auto GO join

When reusing an existing GO for pairing, force its frequency in GO
negotiation.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoP2P2: Make sure password is set when using non opportunistic methods
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:12 +0000 (11:10 +0200)] 
P2P2: Make sure password is set when using non opportunistic methods

Otherwise the flow would continue, eventually falling back to PASN
method instead of SAE even if not allowed in PBMA.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoP2P2: Report R2 information in P2P-DEVICE-FOUND event
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:11 +0000 (11:10 +0200)] 
P2P2: Report R2 information in P2P-DEVICE-FOUND event

Add PCEA capability information, supported PASN types, and bootstrap
methods in P2P-DEVICE-FOUND event. This is needed to be able to start
P2P2 pairing with the discovered peer.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoNAN: Remove excessive debug print about the next timer
Andrei Otcheretianski [Tue, 26 Nov 2024 09:10:10 +0000 (11:10 +0200)] 
NAN: Remove excessive debug print about the next timer

As it polutes the log too much.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agowpa_cli: Support NAN USD commands
Andrei Otcheretianski [Mon, 9 Dec 2024 16:12:10 +0000 (18:12 +0200)] 
wpa_cli: Support NAN USD commands

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoNAN: Fix A3 for unicast P2P2 USD
Andrei Otcheretianski [Thu, 19 Dec 2024 09:18:50 +0000 (11:18 +0200)] 
NAN: Fix A3 for unicast P2P2 USD

According to the Wi-Fi Direct spec draft, address 3 in unicast USD
frames shall be set to the P2P Device Address of the sender (i.e., this
differs from the Wi-Fi Aware specification). Fix it.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agoNAN: Fix A3 for multicast P2P2 USD
Andrei Otcheretianski [Thu, 19 Dec 2024 09:18:50 +0000 (11:18 +0200)] 
NAN: Fix A3 for multicast P2P2 USD

According to the Wi-Fi Direct spec draft, address 3 in multicast USD
frames shall be set to wildcard BSSID (i.e., this differs from the Wi-Fi
Aware specification). Fix it.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
7 months agotests: ML association based on scanning only the second link
Jouni Malinen [Mon, 23 Dec 2024 10:33:42 +0000 (12:33 +0200)] 
tests: ML association based on scanning only the second link

This increases testing coverage for MLO by having to use ML probe for
missing links and using link ID for association.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agoSend CTRL-EVENT-SIGNAL-CHANGE message to control interfaces only
Kan-Ru Chen [Sun, 22 Dec 2024 23:42:33 +0000 (08:42 +0900)] 
Send CTRL-EVENT-SIGNAL-CHANGE message to control interfaces only

The default logging level for the CTRL-EVENT-SIGNAL-CHANGE message
may be repeated many times and fill the log file or journal.

For example https://bugzilla.redhat.com/show_bug.cgi?id=2309148 and
the first few results from searching CTRL-EVENT-SIGNAL-CHANGE on the
web contain various complaints and workarounds.

Change the logging method to wpa_msg_ctrl to avoid sending frequent
messages to the syslog but still allow the message to be consumed by
control interface monitors.

Signed-off-by: Kan-Ru Chen <kanru@kanru.info>
7 months agotests: Additional test case to UML-issues-list
Jouni Malinen [Sun, 22 Dec 2024 23:01:08 +0000 (01:01 +0200)] 
tests: Additional test case to UML-issues-list

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agotests: Split hostapd_oom_wpa2_eap_connect into multiple test cases
Jouni Malinen [Sun, 22 Dec 2024 22:55:09 +0000 (00:55 +0200)] 
tests: Split hostapd_oom_wpa2_eap_connect into multiple test cases

This test case could take a long time to execute and it can be easily
split into a set of test cases that each cover a smaller range of
iterations (50 each for now). This is more robust and more efficient for
parallel VMs.

Signed-off-by: Jouni Malinen <j@w1.fi>
7 months agohostapd: hostapd_cleanup_iface_partial: Fix hw_features use after free
Petr Štetiar [Wed, 18 Dec 2024 07:50:18 +0000 (07:50 +0000)] 
hostapd: hostapd_cleanup_iface_partial: Fix hw_features use after free

Currently when the iface is being cleaned up, the
hostapd_free_hw_features() is called which frees the underlying
hw_features and the struct is being NULLed, but the num_hw_features
counter is not being reset, thus following commonly used access
constructs:

   for (i = 0; i < iface->num_hw_features; i++)
            acs_cleanup_mode(&iface->hw_features[i]);

This might then lead to use after free and hostapd for example might
crash during configuration reload on disabled interfaces:

  $ hostapd -ddt /tmp/wlan2_hapd.conf &
  $ hostapd_cli -i wlan2 raw DISABLE

  Fri Oct  4 20:44:04 2024 1728074644.706408: wlan2: AP-DISABLED

  $ kill -SIGHUP $(pidof hostapd)
  Segmentation fault (core dumped) hostapd -ddt /tmp/wlan2_hapd.conf

So lets fix it by resetting the num_hw_features counter to 0, so the
code will not try to access the freed memory in hw_features struct.

Reported-by: Mohammed SI ALI <mohammed.siali@softathome.com>
Tested-by: Houssem Dafdouf <houssem.dafdouf_ext@softathome.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
7 months agoAndroid: Wrap a P2P-specific chunk in CONFIG_P2P
Matthew Wang [Thu, 5 Dec 2024 10:11:16 +0000 (10:11 +0000)] 
Android: Wrap a P2P-specific chunk in CONFIG_P2P

This special driver_cmd handling is specific for P2P and won't compile
without CONFIG_P2P=y.

Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
7 months agoEAPOL: Fix PMK setting for driver-based FT-SHA384
Vinayak Yadawad [Wed, 4 Dec 2024 09:13:59 +0000 (14:43 +0530)] 
EAPOL: Fix PMK setting for driver-based FT-SHA384

Currently in eapol callback PMK update for FT is done wrongly with the
default PMK length even in case of SHA384. SHA384 needs longer 48-octet
PMK. Accordingly, fix the offset and length of the PMK that is
configured to the driver for driver-based FT.

Signed-off-by: Vinayak Yadawad <vinayak.yadawad@broadcom.com>
7 months agoDPP: Handle EVENT_TX_WAIT_EXPIRE path for push button
andrewrpope [Mon, 25 Nov 2024 21:11:52 +0000 (08:11 +1100)] 
DPP: Handle EVENT_TX_WAIT_EXPIRE path for push button

The DPP push button state machine will get stuck if an off-channel PB
announcement is cancelled via EVENT_TX_WAIT_EXPIRE. Handle a
TX_WAIT_EXPIRE by calling wpas_dpp_pb_next(), moving the state machine
forward.

Signed-off-by: Andrew Pope <andrew.pope@morsemicro.com>
7 months agotests: Remove setting of the now removed p2p_pairing_verification
Jouni Malinen [Sun, 22 Dec 2024 21:40:05 +0000 (23:40 +0200)] 
tests: Remove setting of the now removed p2p_pairing_verification

Signed-off-by: Jouni Malinen <j@w1.fi>