Skip to content

Commit 60158fe

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 115aa04 commit 60158fe

File tree

2 files changed

+59
-2
lines changed

2 files changed

+59
-2
lines changed

modules/hostap/CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,25 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
603603
)
604604
endif()
605605

606+
if(DEFINED CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA)
607+
zephyr_include_directories(
608+
${HOSTAP_BASE}/port/mbedtls
609+
)
610+
611+
zephyr_library_sources(
612+
${HOSTAP_SRC_BASE}/crypto/aes-wrap.c
613+
${HOSTAP_SRC_BASE}/crypto/aes-unwrap.c
614+
${HOSTAP_SRC_BASE}/crypto/aes-internal-dec.c
615+
${HOSTAP_SRC_BASE}/crypto/aes-internal.c
616+
${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c
617+
${HOSTAP_SRC_BASE}/crypto/rc4.c
618+
${HOSTAP_SRC_BASE}/crypto/crypto_mbedtls_alt.c
619+
${HOSTAP_SRC_BASE}/crypto/tls_mbedtls_alt.c
620+
${HOSTAP_SRC_BASE}/crypto/sha256-kdf.c
621+
${HOSTAP_BASE}/port/mbedtls/supp_psa_api.c
622+
)
623+
endif()
624+
606625
zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
607626
mbedTLS)
608627

modules/hostap/Kconfig

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,57 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_LEGACY_NCS
228228
select MBEDTLS_PK_WRITE_C
229229
select MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
230230

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

234271
endchoice
235272

236273
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
237274
bool "Crypto Platform Secure Architecture support for WiFi"
275+
default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
238276
help
239277
Support Mbedtls 3.x to use PSA apis instead of legacy apis.
240278

241279
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
242280
bool "Enterprise Crypto support for WiFi"
243-
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
281+
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
244282

245283
config EAP_TLS
246284
bool "EAP-TLS support"
@@ -294,7 +332,7 @@ config EAP_ALL
294332

295333
config WIFI_NM_WPA_SUPPLICANT_WPA3
296334
bool "WPA3 support"
297-
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
335+
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
298336
default y
299337

300338
config WIFI_NM_WPA_SUPPLICANT_AP

0 commit comments

Comments
 (0)