diff --git a/doc/nrf/app_dev/device_guides/nrf70/wifi_advanced_security_modes.rst b/doc/nrf/app_dev/device_guides/nrf70/wifi_advanced_security_modes.rst index 789ea62c23dc..913992475d80 100644 --- a/doc/nrf/app_dev/device_guides/nrf70/wifi_advanced_security_modes.rst +++ b/doc/nrf/app_dev/device_guides/nrf70/wifi_advanced_security_modes.rst @@ -181,7 +181,7 @@ To build the nRF70 Series DK for the :ref:`wifi_shell_sample` sample with Enterp cd nrf/samples/wifi/shell - west build -p -b nrf7002dk/nrf5340/cpuapp -- -DEXTRA_CONF_FILE=overlay-enterprise.conf -DCONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y -DCONFIG_LOG_MODE_IMMEDIATE=y + west build -p -b nrf7002dk/nrf5340/cpuapp -S shell_SNIPPET=wifi-enterprise -- -DCONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y -DCONFIG_LOG_MODE_IMMEDIATE=y west flash diff --git a/samples/wifi/offloaded_raw_tx/prj.conf b/samples/wifi/offloaded_raw_tx/prj.conf index 57fef3aa9580..618610421569 100644 --- a/samples/wifi/offloaded_raw_tx/prj.conf +++ b/samples/wifi/offloaded_raw_tx/prj.conf @@ -4,5 +4,3 @@ CONFIG_NRF70_OFFLOADED_RAW_TX=y # Memories CONFIG_MAIN_STACK_SIZE=5200 -CONFIG_HEAP_MEM_POOL_SIZE=18000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y diff --git a/samples/wifi/provisioning/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/wifi/provisioning/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..c94db5e04f39 --- /dev/null +++ b/samples/wifi/provisioning/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -0,0 +1,7 @@ +CONFIG_WIFI_CREDENTIALS=y +# Needed for Wi-Fi credentials +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y +CONFIG_ZMS=y +CONFIG_SETTINGS=y diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index 57661b25f72a..ccb833b17017 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -10,10 +10,8 @@ CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xa000 CONFIG_PM_PARTITION_SIZE_TFM=0x20000 # Optimize Wi-Fi stack to save some memory. -CONFIG_HEAP_MEM_POOL_SIZE=50000 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=53000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NRF70_MAX_TX_AGGREGATION=4 diff --git a/samples/wifi/provisioning/softap/sample.yaml b/samples/wifi/provisioning/softap/sample.yaml index 05626070aa94..4f8e121c241e 100644 --- a/samples/wifi/provisioning/softap/sample.yaml +++ b/samples/wifi/provisioning/softap/sample.yaml @@ -11,3 +11,18 @@ tests: - ci_build - sysbuild - ci_samples_wifi + sample.nrf54l15.softap.wifi.provision: + sysbuild: true + build_only: true + extra_args: + - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" + - softap_SNIPPET=nrf70-wifi + - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n + integration_platforms: + - nrf54l15dk/nrf54l15/cpuapp + platform_allow: + - nrf54l15dk/nrf54l15/cpuapp + tags: + - ci_build + - sysbuild + - ci_samples_wifi diff --git a/samples/wifi/radio_test/multi_domain/prj.conf b/samples/wifi/radio_test/multi_domain/prj.conf index 6ffad8ff103d..a73e66385d20 100644 --- a/samples/wifi/radio_test/multi_domain/prj.conf +++ b/samples/wifi/radio_test/multi_domain/prj.conf @@ -16,11 +16,6 @@ CONFIG_MAIN_STACK_SIZE=5200 CONFIG_SHELL_STACK_SIZE=5200 #64K memory needed for IQ sample captures. CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=78304 -#TODO: HAL command queue is using data pool. Needs -# to be changed to use ctrl pool. -CONFIG_NRF_WIFI_DATA_HEAP_SIZE=20000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y - # Debugging CONFIG_STACK_SENTINEL=y diff --git a/samples/wifi/raw_tx_packet/prj.conf b/samples/wifi/raw_tx_packet/prj.conf index e1b85600903c..4f230edbe1f6 100644 --- a/samples/wifi/raw_tx_packet/prj.conf +++ b/samples/wifi/raw_tx_packet/prj.conf @@ -32,10 +32,10 @@ CONFIG_NET_PKT_TX_COUNT=8 # tuned for performance, but this will be revisited in the future. CONFIG_NET_BUF_RX_COUNT=8 CONFIG_NET_BUF_TX_COUNT=16 -CONFIG_HEAP_MEM_POOL_SIZE=105000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NET_TC_TX_COUNT=1 +# TODO: Fix unaligned buffers over (Q)SPI when Zero-copy TX is enabled +CONFIG_NRF_WIFI_ZERO_COPY_TX=n CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1 CONFIG_NET_MAX_CONTEXTS=5 diff --git a/samples/wifi/scan/prj.conf b/samples/wifi/scan/prj.conf index be1d4e73c390..c02184f45358 100644 --- a/samples/wifi/scan/prj.conf +++ b/samples/wifi/scan/prj.conf @@ -6,8 +6,6 @@ CONFIG_WIFI=y CONFIG_WIFI_NRF70=y CONFIG_NET_L2_WIFI_MGMT=y -CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=25000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y # System settings CONFIG_ASSERT=y diff --git a/samples/wifi/shell/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/wifi/shell/boards/nrf54l15dk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..c94db5e04f39 --- /dev/null +++ b/samples/wifi/shell/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -0,0 +1,7 @@ +CONFIG_WIFI_CREDENTIALS=y +# Needed for Wi-Fi credentials +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y +CONFIG_ZMS=y +CONFIG_SETTINGS=y diff --git a/samples/wifi/shell/overlay-enterprise.conf b/samples/wifi/shell/overlay-enterprise.conf deleted file mode 100644 index 3062cabdf275..000000000000 --- a/samples/wifi/shell/overlay-enterprise.conf +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y -# Use variable data size to reduce memory usage for small data packets -CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y -# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap -# for MbedTLS gives us more control over the heap size. -CONFIG_MBEDTLS_ENABLE_HEAP=y -CONFIG_MBEDTLS_HEAP_SIZE=70000 - -CONFIG_NET_PKT_RX_COUNT=12 -CONFIG_NET_PKT_TX_COUNT=12 -CONFIG_NET_BUF_RX_COUNT=36 -CONFIG_NET_BUF_TX_COUNT=36 - -# Need default heap by driver and hostap which is higher than prj.conf -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n -CONFIG_SHELL_STACK_SIZE=5400 diff --git a/samples/wifi/shell/prj.conf b/samples/wifi/shell/prj.conf index fa9dc8c5e429..30b668f62dcd 100644 --- a/samples/wifi/shell/prj.conf +++ b/samples/wifi/shell/prj.conf @@ -34,9 +34,6 @@ CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NRF70_MAX_TX_AGGREGATION=4 -# nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental) -CONFIG_HEAP_MEM_POOL_SIZE=40144 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NET_TC_TX_COUNT=1 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4 diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index b05c2bb320b0..c3a7d813cab8 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -311,6 +311,26 @@ tests: - ci_build - sysbuild - ci_samples_wifi + sample.nrf7002eb_interposer_p1.nrf7002eb.shell.superset: + sysbuild: true + build_only: true + extra_args: + - shell_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" + - shell_SNIPPET=nrf70-wifi + - EXTRA_CONF_FILE=overlay-zperf.conf + - CONFIG_NRF70_UTIL=y + - CONFIG_WPA_CLI=y + - CONFIG_NET_IPV4_FRAGMENT=y + - CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 + - CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199000 + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + tags: + - ci_build + - sysbuild + - ci_samples_wifi sample.nrf7002eb2.shell: sysbuild: true build_only: true @@ -417,7 +437,7 @@ tests: sample.nrf7002.enterprise_mode: sysbuild: true build_only: true - extra_args: EXTRA_CONF_FILE=overlay-enterprise.conf + extra_args: shell_SNIPPET=wifi-enterprise integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp @@ -498,3 +518,18 @@ tests: - ci_build - sysbuild - ci_samples_wifi + sample.nrf54l15.softap.superset: + sysbuild: true + build_only: true + extra_args: + - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" + - softap_SNIPPET=nrf70-wifi + - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n + integration_platforms: + - nrf54l15dk/nrf54l15/cpuapp + platform_allow: + - nrf54l15dk/nrf54l15/cpuapp + tags: + - ci_build + - sysbuild + - ci_samples_wifi diff --git a/samples/wifi/shutdown/prj.conf b/samples/wifi/shutdown/prj.conf index eb88df4e26f8..2d831dedcfc5 100644 --- a/samples/wifi/shutdown/prj.conf +++ b/samples/wifi/shutdown/prj.conf @@ -6,8 +6,6 @@ CONFIG_WIFI=y CONFIG_WIFI_NRF70=y CONFIG_NET_L2_WIFI_MGMT=y -CONFIG_HEAP_MEM_POOL_SIZE=25000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y # Networking CONFIG_NETWORKING=y diff --git a/samples/wifi/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/wifi/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf new file mode 100644 index 000000000000..c94db5e04f39 --- /dev/null +++ b/samples/wifi/softap/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -0,0 +1,7 @@ +CONFIG_WIFI_CREDENTIALS=y +# Needed for Wi-Fi credentials +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y +CONFIG_ZMS=y +CONFIG_SETTINGS=y diff --git a/samples/wifi/softap/prj.conf b/samples/wifi/softap/prj.conf index 37969c7fe0d0..d2b459dc1e32 100644 --- a/samples/wifi/softap/prj.conf +++ b/samples/wifi/softap/prj.conf @@ -32,8 +32,6 @@ CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_BUF_RX_COUNT=8 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NRF70_RX_NUM_BUFS=16 -CONFIG_HEAP_MEM_POOL_SIZE=51000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=53000 CONFIG_NET_TC_TX_COUNT=1 diff --git a/samples/wifi/softap/sample.yaml b/samples/wifi/softap/sample.yaml index 0830bbfa4d78..efe9fa712af6 100644 --- a/samples/wifi/softap/sample.yaml +++ b/samples/wifi/softap/sample.yaml @@ -64,6 +64,7 @@ tests: extra_args: - softap_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" - softap_SNIPPET=nrf70-wifi + - CONFIG_HEAP_MEM_POOL_IGNORE_MIN=n integration_platforms: - nrf54l15dk/nrf54l15/cpuapp platform_allow: diff --git a/samples/wifi/throughput/overlay-high-performance.conf b/samples/wifi/throughput/overlay-high-performance.conf index a1b1cede0bd3..732e93f51291 100644 --- a/samples/wifi/throughput/overlay-high-performance.conf +++ b/samples/wifi/throughput/overlay-high-performance.conf @@ -4,7 +4,6 @@ CONFIG_NET_PKT_TX_COUNT=30 CONFIG_NET_PKT_RX_COUNT=27 CONFIG_NET_BUF_TX_COUNT=60 CONFIG_NET_BUF_RX_COUNT=27 -CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=15000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=204856 CONFIG_SPEED_OPTIMIZATIONS=y diff --git a/samples/wifi/throughput/overlay-iot-devices.conf b/samples/wifi/throughput/overlay-iot-devices.conf index aaa41ede0923..c85e4ddfe58a 100644 --- a/samples/wifi/throughput/overlay-iot-devices.conf +++ b/samples/wifi/throughput/overlay-iot-devices.conf @@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_BUF_TX_COUNT=12 CONFIG_NET_BUF_RX_COUNT=6 CONFIG_NRF70_RX_NUM_BUFS=6 -CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856 CONFIG_SPEED_OPTIMIZATIONS=y diff --git a/samples/wifi/throughput/overlay-memory-optimized.conf b/samples/wifi/throughput/overlay-memory-optimized.conf index 50fb20cafb77..7ef8797d773a 100644 --- a/samples/wifi/throughput/overlay-memory-optimized.conf +++ b/samples/wifi/throughput/overlay-memory-optimized.conf @@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_BUF_TX_COUNT=12 CONFIG_NET_BUF_RX_COUNT=6 CONFIG_NRF70_RX_NUM_BUFS=6 -CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856 CONFIG_SPEED_OPTIMIZATIONS=y diff --git a/samples/wifi/throughput/overlay-rx-prio.conf b/samples/wifi/throughput/overlay-rx-prio.conf index 1ea9bd1b66a2..5dd439d31eba 100644 --- a/samples/wifi/throughput/overlay-rx-prio.conf +++ b/samples/wifi/throughput/overlay-rx-prio.conf @@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=64 CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_BUF_RX_COUNT=64 CONFIG_NRF70_RX_NUM_BUFS=64 -CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856 CONFIG_SPEED_OPTIMIZATIONS=y diff --git a/samples/wifi/throughput/overlay-tx-prio.conf b/samples/wifi/throughput/overlay-tx-prio.conf index 07093e6ad0dc..187917110c55 100644 --- a/samples/wifi/throughput/overlay-tx-prio.conf +++ b/samples/wifi/throughput/overlay-tx-prio.conf @@ -5,7 +5,6 @@ CONFIG_NET_PKT_RX_COUNT=10 CONFIG_NET_BUF_TX_COUNT=64 CONFIG_NET_BUF_RX_COUNT=10 CONFIG_NRF70_RX_NUM_BUFS=10 -CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=199856 CONFIG_SPEED_OPTIMIZATIONS=y diff --git a/samples/wifi/throughput/prj.conf b/samples/wifi/throughput/prj.conf index 783b92c70d60..97d1a4719f55 100644 --- a/samples/wifi/throughput/prj.conf +++ b/samples/wifi/throughput/prj.conf @@ -36,9 +36,6 @@ CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NRF70_MAX_TX_AGGREGATION=4 -# nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental) -CONFIG_HEAP_MEM_POOL_SIZE=110000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NET_TC_TX_COUNT=1 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4 diff --git a/samples/wifi/twt/prj.conf b/samples/wifi/twt/prj.conf index 9fec5de6a6b1..c108c798b3f7 100644 --- a/samples/wifi/twt/prj.conf +++ b/samples/wifi/twt/prj.conf @@ -29,8 +29,6 @@ CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_PKT_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NET_BUF_RX_COUNT=16 -CONFIG_HEAP_MEM_POOL_SIZE=105000 -CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF70_RX_NUM_BUFS=16 #CONFIG_SPEED_OPTIMIZATIONS=y #CONFIG_NRF70_MAX_TX_AGGREGATION=9 diff --git a/subsys/net/lib/hostap_crypto/Kconfig b/subsys/net/lib/hostap_crypto/Kconfig index 44e6a05098e1..d6514861f381 100644 --- a/subsys/net/lib/hostap_crypto/Kconfig +++ b/subsys/net/lib/hostap_crypto/Kconfig @@ -92,6 +92,7 @@ config HOSTAP_CRYPTO_ENTERPRISE select MBEDTLS_TLS_VERSION_1_2 select MBEDTLS_RSA_C select MBEDTLS_SSL_SERVER_NAME_INDICATION + select MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME default y endif diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy index fe746150f4a3..5ac7c23359ca 100644 --- a/subsys/nrf_security/Kconfig.legacy +++ b/subsys/nrf_security/Kconfig.legacy @@ -899,5 +899,8 @@ config MBEDTLS_PEM_WRITE_C prompt "Support writing PEM files" depends on MBEDTLS_BASE64_C +config MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME + bool + depends on WIFI_NM_WPA_SUPPLICANT endmenu # Legacy mbed TLS crypto APIs diff --git a/subsys/nrf_security/configs/legacy_crypto_config.h.template b/subsys/nrf_security/configs/legacy_crypto_config.h.template index d4c8823f6555..76318ce9ca39 100644 --- a/subsys/nrf_security/configs/legacy_crypto_config.h.template +++ b/subsys/nrf_security/configs/legacy_crypto_config.h.template @@ -3252,6 +3252,10 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/ #define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */ #endif +#if defined(CONFIG_MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME) +#define MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME +#endif + #if CONFIG_MBEDTLS_CMAC_ALT /* NCSDK-24838 */ #define MBEDTLS_CIPHER_MODE_CBC diff --git a/west.yml b/west.yml index b0e1b493acaa..fc56be3d5a7c 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: bdc3de9a2dd87f5cafa33ad32aed1e198fdbb922 + revision: 23dea7fdbd03f4280dd4a5028ce2ac91bb67f3c4 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -144,7 +144,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: 616c9776b3a646ec482439c64e0372ab527ffaa9 + revision: 1a6caa79d3bdc438b47022adff5aff16e9da811c - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m