Skip to content

Conversation

@rghaddab
Copy link
Contributor

This resolves some addressed comments in this PR
zephyrproject-rtos#77930
as well as this PR
zephyrproject-rtos#80407

frkv and others added 30 commits October 24, 2024 16:19
-base64 API belongs to the Mbed TLS deliverable. This avoids taking in
 the duplicated APIs from hostap

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
(cherry picked from commit aeca13c)
OCT-3045
This fix is related to nrfconnect#2006
this adds the bt-ll-sw-split snippet for more bluetooth samples

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
(cherry picked from commit ea3ab04)
Not all offloaded network stacks support this socket option.

Go back to previous behavior that it is not used, but allow it
to be enabled using CONFIG_COAP_CLIENT_TRUNCATE_MSGS.

Signed-off-by: Pete Skeggs <[email protected]>
(cherry picked from commit fddbbd1)
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)
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)
Implement AP configuration parameter operations.

Signed-off-by: Gang Li <[email protected]>
(cherry picked from commit 4bfdb64)
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)
Supp api add reg domain support.

Signed-off-by: Rex Chen <[email protected]>
(cherry picked from commit 5a19500)
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)
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)
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)
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)
…P mode

The default should honor the build time flag.

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

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 9704284)
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)
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)
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)
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)
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)
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)
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)
Update hostap revision to get supplicant event numbers
correctly.

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

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

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 5c9c95b)
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)
…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)
… 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)
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)
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)
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)
aescolar and others added 21 commits October 31, 2024 14:35
Let's run tests with security/privacy with the HW models acutually
running the encryptions, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 9182a7e)
…cryption

Let's run tests with security/privacy with the HW models acutually
running the encryptions, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 3726cf3)
Changed the scan option type from uint32_t to
uint8_t.

There are 2 reasons for this:
1) This reduces the size of the struct bt_le_scan_param.
   Since we are now storing two copies of scan parameters
   statically in the host, this is not insignficant.
2) This fixes a "hole" in the struct. There are no longer
   3 empty octets between the `type` and the `options`, which
   caused valgrind warnings when using `memcpy` and `memcmp`
   of the struct.

Currently we only need 8 bits for the options available.
If additional options are added later, the field need
to be increased. For the above reasons some additional
refactoring my be required to avoid significant size
increases and the valgrind issue.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit e1e4f2a)
Update the string formatter according to the type of the
variables that it is printing to eliminate compilation
warnings.

Signed-off-by: Yong Cong Sin <[email protected]>
Signed-off-by: Yong Cong Sin <[email protected]>
(cherry picked from commit d250664)
…me in shell

Added a timeout for active scans (instead of using the host's scan
timeout) in the shell by submitting a k_work that stops the scan
after a specified period.

Fixes #78659

Signed-off-by: Babak Arisian <[email protected]>
(cherry picked from commit d8c1d4d)
Currently, the bonding type of Authentication
_Requirements parameter is always `Dedicated
Bonding` if the device is pairing initiator.

But if the bonding is performed during
connection setup or channel establishment as
a precursor to accessing a service, the
bonding type should be `General bonding`.

Add a flag BT_CONN_BR_GENERAL_BONDING.
Set the flag if the bonding is performed in
the L2CAP_BR/RFCOMM channel establishment.

Set bonding type depends on the flag when
receiving IO cap request.

Signed-off-by: Lyle Zhu <[email protected]>
(cherry picked from commit 08ceb14)
Add a function bt_get_bondable to get the bonding setting.

Signed-off-by: Lyle Zhu <[email protected]>
(cherry picked from commit c0ce5b4)
Correct the `help` of the configuration `BT_BONDABLE`.

Signed-off-by: Lyle Zhu <[email protected]>
(cherry picked from commit 0ed8866)
The timeout state is local and can block new ATT operations, but does
not affect the remote side. Disconnecting the GATT connection upon ATT
timeout simplifies error handling for developers. This reduces rare
failure conditions to a common one, without needing special cases for
ATT timeouts.

Signed-off-by: Pavel Vasilyev <[email protected]>
(cherry picked from commit f712bde)
This commit tests that the host correctly disconnects from peer when ATT
timeout happens.

Signed-off-by: Pavel Vasilyev <[email protected]>
(cherry picked from commit f7e8a87)
…nd_buf"

This reverts commit 687cefa.

Signed-off-by: Pavel Vasilyev <[email protected]>
…p_send_pdu"

This reverts commit b0ce7fe.

Signed-off-by: Pavel Vasilyev <[email protected]>
…ng PDU

In case of UATT, if a connection was lost while user was holding a read
or write attribute callback, `bt_l2cap_send_pdu` (called from
`att.c::chan_send`) will anyway queue a PDU and trigger tx work. The PDU
won't be sent eventually, but neither will hold an error code, which
will allow it to bypass the error check in `att_on_sent_cb` and call
`att_sent` function.

For EATT `bt_l2cap_chan_send` is used which already handles this case
and the error code is passed to `att_on_sent_cb`.

This change adds connection state check to `bt_l2cap_send_pdu`
preventing from unnecessary code execution when connection does not
exist anymore.

Signed-off-by: Pavel Vasilyev <[email protected]>
(cherry picked from commit 74972e6)
Allow for an additional buffer reference if callback is provided. This
can be used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

Signed-off-by: Marek Pieta <[email protected]>
If ATT sent callback is delayed until data transmission is done by BLE
controller, the transmitted buffer may have an additional reference. The
reference is used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

send_buf function can be called multiple times, if buffer has to be
fragmented over HCI. In that case, the callback is provided as an
argument only for the last transmitted fragment. The `buf->ref == 1`
check is skipped because it's impossible to properly validate number of
references for the sent fragments if buffers may have the additional
reference.

Jira: NCSDK-28624

Signed-off-by: Marek Pieta <[email protected]>
This commit adds a warning and a Kconfig option to `bt_conn_le_create`
and `bt_conn_le_create_synced` functions which are meant to warn a user
of a potential leakage of an active connection object.

This change is implemented due to frequent incorrect use of the
connection pointer where a pointer to an existing connection object
is overwritten by `bt_conn_le_create` and `bt_conn_le_create_synced`
functions which in turns leads to sporadic critical bugs. See
zephyrproject-rtos/zephyr#78284 (comment)
for more details.

The Kconfig option is introduced instead of always returning the error
to not affect current implementations. However, it is recommended to
keep this option enabled to avoid potential bugs.

Signed-off-by: Pavel Vasilyev <[email protected]>
(cherry picked from commit 8acb1cc)
…it test

Add a test that checks behavior of
CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE Kconfig option.

Signed-off-by: Pavel Vasilyev <[email protected]>
(cherry picked from commit 1fbcc0e)
To configure APPROTECT on nRF54L15 different set of MDK symbols
must be used. Additionally, nRF54L15 does not support loading
APPROTECT configuration from the UICR in runtime.

Upstream PR #: 80366

Signed-off-by: Nikodem Kastelik <[email protected]>
This resolves some addressed comments in this PR
zephyrproject-rtos/zephyr#77930

It adds as well a section in the documentation about some
recommendations to increase ZMS performance.

Signed-off-by: Riadh Ghaddab <[email protected]>
(cherry picked from commit 46e1635)
This resolves some addressed comments in this PR zephyrproject-rtos#77930
as well as this PR zephyrproject-rtos#80407

Upstream PR #: 80628

Signed-off-by: Riadh Ghaddab <[email protected]>
(cherry picked from commit f8d7586b88a8f80a5dae88caee9d6cdadf67101f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.