Skip to content

Conversation

@NordicBuilder
Copy link
Contributor

Backport 33919fc~124..33919fc from #2142.

MaochenWang1 and others added 30 commits October 25, 2024 12:24
For add_interface(), only add STA interface when hostapd enabled,
and the Soft-AP interface will be added in zephyr_hostapd_init().

Signed-off-by: Maochen Wang <[email protected]>
(cherry picked from commit e2f671e)
(cherry picked from commit fd27114)
wpas_key_mgmt_to_zephyr doesn't support eap secure mode, add code to
support eap secure mode.

Signed-off-by: Gaofeng Zhang <[email protected]>
(cherry picked from commit 94386e1)
(cherry picked from commit 641848d)
Implement AP configuration parameter operations.

Signed-off-by: Gang Li <[email protected]>
(cherry picked from commit 4bfdb64)
(cherry picked from commit 87618b4)
The security check case statements were in frequency band
setting checks. This is totally wrong and will cause compiler
warnings. Moving the checks to correct function.

Signed-off-by: Jukka Rissanen <[email protected]>
(cherry picked from commit 2f47de6)
(cherry picked from commit d7fbdf9)
Supp api add reg domain support.

Signed-off-by: Rex Chen <[email protected]>
(cherry picked from commit 5a19500)
(cherry picked from commit 563c136)
The previous NET_EVENT_SUPPLICANT_CMD_INT_EVENT is from
"enum net_event_supplicant_cmd" but the supplicant_send_wifi_mgmt_event()
has the event parameter as an "enum net_event_wifi_cmd" and those event
number spaces are different.

This meant that the wrong event value NET_EVENT_SUPPLICANT_CMD_INT_EVENT
maps to NET_EVENT_WIFI_CMD_TWT (from "enum net_event_wifi_cmd") which
fortunately did not cause issue in this case because the
supplicant_send_wifi_mgmt_event() has no handling for this TWT event value.

It is important we fix this as this can cause great confusion in the
future.

Signed-off-by: Jukka Rissanen <[email protected]>
(cherry picked from commit 4b83b23)
(cherry picked from commit 883a02f)
Add crypto module test kconfig option
CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST,
which is default n and hidden.
It is only available by developer for crypto module test.

Signed-off-by: Fengming Ye <[email protected]>
(cherry picked from commit e40eef2)
(cherry picked from commit ddddfdd)
This was we can modify it in a single place that works both for native
and OS specific code.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit bcef9ac)
(cherry picked from commit d00ea92)
Now that hostap is used k_heap, it needs to reserve the kernel heap not
libc heap.

Fixes #79477.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 3ade4be)
(cherry picked from commit 4f541cf)
…P mode

The default should honor the build time flag.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit b2c6f6c)
(cherry picked from commit 4ad5c6f)
Instead of hard-coded value, use the build time flag.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 9704284)
(cherry picked from commit 0823505)
The format of wpa_passphrase and sae_password is wrong when start the
SAP, which leads the invaild MIC check error when other STA try to
connect in security mode. Change the wrong format can fix this issue.

Signed-off-by: Maochen Wang <[email protected]>
(cherry picked from commit 838ff13)
(cherry picked from commit 025a9c2)
Add WPA-Auto-Personal support for AP and STA.
This mode uses WPA2/WPA3 SAE mixed security with PSK.

Signed-off-by: Gang Li <[email protected]>
(cherry picked from commit 79222c9)
(cherry picked from commit 51c09bb)
Enabling all EAP types for enterprise mode increases
memory usage in both ROM and RAM. Provide config options for each
type to let solutions choose the methods based on their
requirements.

Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit 609520b)
(cherry picked from commit c8c1eed)
EAP-FAST has extra requirements (TLS 1.3, session tickets etc) and is
seldom used, so, remove it from Enterprise list and add a separate
Kconfig option.

This solves the build error when Enterprise mode is enabled.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 39b904d)
(cherry picked from commit 4206c05)
Enterprise security doesn't have either SAE or PSK, so, using a blanker
else throws a false warning. Fix the checks to proper handler enterprise
mode.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 48916d6)
(cherry picked from commit 9ee4f0a)
When try to start SAP on channel 12 with region code US, the channel
check will fail and calls supplicant_send_wifi_mgmt_ap_status() with
iface->owner is NULL, which causes DUT hang. Set iface->owner when
enable the SAP can fix this issue.

Signed-off-by: Maochen Wang <[email protected]>
(cherry picked from commit a259900)
(cherry picked from commit b0c28c0)
Random MAC address setting can never be configured as the two defaults
cover all cases. Fix the defaults, now the order is

* Fixed
* OTP (default, in case of no config)
* Random

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 80db01f)
(cherry picked from commit 0e8c6cf)
Update hostap revision to get supplicant event numbers
correctly.

Signed-off-by: Jukka Rissanen <[email protected]>
(cherry picked from commit d59bb2f)
(cherry picked from commit 5e13de0)
Update hostap revision to get crypto module test.

Signed-off-by: Fengming Ye <[email protected]>
(cherry picked from commit 20e81f7)
(cherry picked from commit 3ea1f83)
Pull fixes that are in NCS but missed in upstream.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 5c9c95b)
(cherry picked from commit e35cf5b)
The event is sent from both WPA supplicant and hostapd, but hostapd
should only be sent when using hostapd to create the AP.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit edb4744)
(cherry picked from commit 924bf9c)
…ervice

Service for powering peripherals that use GPIO pins
in the global power domains:
- Active Fast
- Active Slow
- Main Slow

Signed-off-by: Rafal Dyla <[email protected]>
(cherry picked from commit ec77fc3)
(cherry picked from commit 8fbe6cb)
… tx mode

Updated hal_nordic revision contains changes for offloaded
raw tx mode.

Signed-off-by: Kapil Bhatt <[email protected]>
(cherry picked from commit 56a5ac5)
(cherry picked from commit 0d5a4eb)
Fix build error of undefined reference to 'inet_aton' in
hostap/src/utils/ip_addr.c

Signed-off-by: Maochen Wang <[email protected]>
(cherry picked from commit 244958c)
(cherry picked from commit 01bddd1)
Create separate offloaded raw tx mode which will work
as stand-alone compile-time mode.

Signed-off-by: Kapil Bhatt <[email protected]>
(cherry picked from commit 5c3cc37)
(cherry picked from commit 269e7a1)
Add wrapper APIs for the offloaded raw TX feature supported
by nRF70 devices.

Signed-off-by: Kapil Bhatt <[email protected]>
(cherry picked from commit 28b7494)
(cherry picked from commit ba2cb8e)
…RF70 FW file"

This reverts commit fe2288d.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit df2a63e)
…nges

Whenever FW blobs are updated manually, we need to tell cmake to
auto-build the source files to use the latest firmware without doing a
pristine build.

This adds a custom target to be run with nRF Wi-Fi driver and updates
timestamp of fw_load.c to rebuild whenevr the blob is updated.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit e2e96ac)
(cherry picked from commit 49ef1c1)
… are changes"

This reverts commit e2e96ac.
This will be properly fixes by adding a target for nRF70.bin and
removing INCBIN approach.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 7f9be54)
(cherry picked from commit 4c14fdc)
krish2718 and others added 15 commits October 25, 2024 12:24
…imeout

WPA control interface timeout is hardcoded to 10s, add a configuration
option to remove the hardcode, this is needed sometimes as a workaround
e.g., crypto taking too long to complete the request.

Work around for #79834, increase the default from 10 to 15s, in positive
case this will have no impact.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 78f5821)
(cherry picked from commit b1c9526)
Execute certificate headers creation rules only if Wi-Fi Enterprise mode
is enabled.

Upstream PR: zephyrproject-rtos/zephyr#80212

Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit 313c103)
Few build errors due to bugs in previous commits.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit f6b60bd)
(cherry picked from commit 7ef355b)
The defines should explicitly be passed to nordic HAL as they dont' use
the CONFIG_ prefix.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 3098c48)
(cherry picked from commit 0e3b836)
Missed adding CONFIG_ to the configuration option.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit f840f66)
(cherry picked from commit baaca29)
When debug is disabled, seeing a build error for unused variable.

Upstream PR: zephyrproject-rtos/zephyr#80315

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 8af79d4)
Support Wi-Fi enterprise mode with NRF_SECURITY.

Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit 371c48b)
Enable wifi sample to connect in EAP-TLS mode. Create sample
certificates.

Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit d4911e8)
This brings in PSA Kconfig and CMakelist.txt changes to NCS.
Currently, it contains known PSA configurations and source files
that are needed or will be needed in the future. WPA3 and
Enterprise is currently disabled with this setting.

Signed-off-by: Vivekananda Uppunda <[email protected]>
Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 01ba392)
Make sure Wi-Fi driver is enabled when sysbuild is used. For shields we
cannot automate this, as sysbuild doesn't recognize shields, so, Wi-Fi
has to be explicitly enabled, this is done for twister.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit c877fde)
Build throw macro redefined error as it's already defined by the nRF
security module.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 2635f7e)
The file has been removed upstream, but as upstream doesn't have NS
support, this need to be fixed explicitly.

Upstream PR: zephyrproject-rtos/zephyr#79606

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 9236bc2)
NS builds need to use PSA for entropy same as 54L.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 34010be)
Upstream certificates are RSA3K + Suite-B, they are not support yet on
nRF boards, so, generate a new certificate for both phase1 and phase2
and use them.

Signed-off-by: Chaitanya Tata <[email protected]>
Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit 130d420)
For 54H Legacy mode is broken, so, enable PSA at the cost of supporting
WPA2 only.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 33919fc)
@NordicBuilder
Copy link
Contributor Author

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@bc25c09 zephyrproject-rtos/hal_nordic@cb7600a (master) zephyrproject-rtos/[email protected]
hostap zephyrproject-rtos/hostap@9896a2e zephyrproject-rtos/hostap@4428531 zephyrproject-rtos/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@rlubos rlubos merged commit dabbd68 into v3.7.99-ncs1-branch Oct 25, 2024
29 checks passed
@rlubos rlubos deleted the backport-2142-to-v3.7.99-ncs1-branch branch October 30, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.