Skip to content

Commit 9da2da9

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 f33dff9 commit 9da2da9

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
@@ -612,6 +612,25 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
612612
)
613613
endif()
614614

615+
if(DEFINED CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA)
616+
zephyr_include_directories(
617+
${HOSTAP_BASE}/port/mbedtls
618+
)
619+
620+
zephyr_library_sources(
621+
${HOSTAP_SRC_BASE}/crypto/aes-wrap.c
622+
${HOSTAP_SRC_BASE}/crypto/aes-unwrap.c
623+
${HOSTAP_SRC_BASE}/crypto/aes-internal-dec.c
624+
${HOSTAP_SRC_BASE}/crypto/aes-internal.c
625+
${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c
626+
${HOSTAP_SRC_BASE}/crypto/rc4.c
627+
${HOSTAP_SRC_BASE}/crypto/crypto_mbedtls_alt.c
628+
${HOSTAP_SRC_BASE}/crypto/tls_mbedtls_alt.c
629+
${HOSTAP_SRC_BASE}/crypto/sha256-kdf.c
630+
${HOSTAP_BASE}/port/mbedtls/supp_psa_api.c
631+
)
632+
endif()
633+
615634
zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
616635
mbedTLS)
617636

modules/hostap/Kconfig

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,20 +228,57 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_LEGACY_NCS
228228
select MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
229229
select MBEDTLS_ENTROPY_C
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_ACCEL_CBC_MAC_AES_128
250+
select PSA_ACCEL_CBC_MAC_AES_192
251+
select PSA_ACCEL_CBC_MAC_AES_256
252+
select PSA_WANT_ALG_CCM
253+
select PSA_WANT_ALG_GCM
254+
select PSA_WANT_ALG_CTR
255+
select PSA_WANT_ALG_MD5
256+
select PSA_ACCEL_MD5
257+
select PSA_WANT_ALG_SHA_1
258+
select PSA_WANT_ALG_SHA_256
259+
select PSA_WANT_ALG_SHA_224
260+
select PSA_WANT_ALG_SHA_384
261+
select PSA_WANT_ALG_SHA_512
262+
select PSA_WANT_ALG_PBKDF2_HMAC
263+
select PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
264+
select PSA_WANT_KEY_TYPE_AES
265+
select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
266+
231267
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
232268
bool "No Crypto support for WiFi"
233269

234270
endchoice
235271

236272
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
237273
bool "Crypto Platform Secure Architecture support for WiFi"
274+
default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
238275
help
239276
Support Mbedtls 3.x to use PSA apis instead of legacy apis.
240277

241278
config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
242279
bool "Enterprise Crypto support for WiFi"
243280
select MBEDTLS_PEM_CERTIFICATE_FORMAT
244-
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
245282

246283
config EAP_TLS
247284
bool "EAP-TLS support"
@@ -298,7 +335,7 @@ config EAP_ALL
298335

299336
config WIFI_NM_WPA_SUPPLICANT_WPA3
300337
bool "WPA3 support"
301-
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
338+
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA
302339
default y
303340

304341
config WIFI_NM_WPA_SUPPLICANT_AP

0 commit comments

Comments
 (0)