Skip to content

Commit 201bcb9

Browse files
committed
[nrf noup] modules: hostap: Add NCS PSA for hostap crypto ALT
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]>
1 parent 8bf4fc2 commit 201bcb9

File tree

2 files changed

+58
-2
lines changed

2 files changed

+58
-2
lines changed

modules/hostap/CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,25 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
655655
)
656656
endif()
657657

658+
if(DEFINED CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA)
659+
zephyr_include_directories(
660+
${HOSTAP_BASE}/port/mbedtls
661+
)
662+
663+
zephyr_library_sources(
664+
${HOSTAP_SRC_BASE}/crypto/aes-wrap.c
665+
${HOSTAP_SRC_BASE}/crypto/aes-unwrap.c
666+
${HOSTAP_SRC_BASE}/crypto/aes-internal-dec.c
667+
${HOSTAP_SRC_BASE}/crypto/aes-internal.c
668+
${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c
669+
${HOSTAP_SRC_BASE}/crypto/rc4.c
670+
${HOSTAP_SRC_BASE}/crypto/crypto_mbedtls_alt.c
671+
${HOSTAP_SRC_BASE}/crypto/tls_mbedtls_alt.c
672+
${HOSTAP_SRC_BASE}/crypto/sha256-kdf.c
673+
${HOSTAP_BASE}/port/mbedtls/supp_psa_api.c
674+
)
675+
endif()
676+
658677
zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
659678
mbedTLS)
660679

modules/hostap/Kconfig

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,50 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_LEGACY_NCS
230230
select MBEDTLS_CIPHER_PADDING_PKCS7
231231
select MBEDTLS_PKCS5_C
232232

233+
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
234+
bool "PSA Crypto support for WiFi WPA2 using nRF security"
235+
select MBEDTLS
236+
select NRF_SECURITY
237+
select PSA_WANT_GENERATE_RANDOM
238+
select MBEDTLS_TLS_LIBRARY
239+
select MBEDTLS_PK_C
240+
select MBEDTLS_PK_WRITE_C
241+
select MBEDTLS_X509_LIBRARY
242+
select MBEDTLS_X509_CRT_PARSE_C
243+
select MBEDTLS_SSL_TLS_C
244+
select MBEDTLS_ENABLE_HEAP
245+
select MBEDTLS_PSA_CRYPTO_C
246+
select MBEDTLS_USE_PSA_CRYPTO
247+
select PSA_WANT_ALG_HMAC
248+
select PSA_WANT_ALG_CMAC
249+
select PSA_WANT_ALG_ECB_NO_PADDING
250+
select PSA_WANT_ALG_CBC_PKCS7
251+
select PSA_ACCEL_CBC_MAC_AES_128
252+
select PSA_ACCEL_CBC_MAC_AES_192
253+
select PSA_ACCEL_CBC_MAC_AES_256
254+
select PSA_WANT_ALG_CCM
255+
select PSA_WANT_ALG_GCM
256+
select PSA_WANT_ALG_CTR
257+
select PSA_WANT_ALG_MD5
258+
select PSA_ACCEL_MD5
259+
select PSA_WANT_ALG_SHA_1
260+
select PSA_WANT_ALG_SHA_256
261+
select PSA_WANT_ALG_SHA_224
262+
select PSA_WANT_ALG_SHA_384
263+
select PSA_WANT_ALG_SHA_512
264+
select PSA_WANT_ALG_PBKDF2_HMAC
265+
select PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
266+
select PSA_WANT_KEY_TYPE_AES
267+
select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
268+
233269
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
234270
bool "No Crypto support for WiFi"
235271

236272
endchoice
237273

238274
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
239275
bool "Crypto Platform Secure Architecture support for WiFi"
276+
default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
240277
help
241278
Support Mbedtls 3.x to use PSA apis instead of legacy apis.
242279

@@ -253,7 +290,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
253290
select MBEDTLS_X509_CRL_PARSE_C
254291
select MBEDTLS_TLS_VERSION_1_2
255292
select MBEDTLS_RSA_C
256-
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
293+
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
257294

258295
config EAP_TLS
259296
bool "EAP-TLS support"
@@ -310,7 +347,7 @@ config EAP_ALL
310347

311348
config WIFI_NM_WPA_SUPPLICANT_WPA3
312349
bool "WPA3 support"
313-
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
350+
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
314351
default y
315352

316353
config WIFI_NM_WPA_SUPPLICANT_AP

0 commit comments

Comments
 (0)