Skip to content

Commit c69834f

Browse files
krish2718nordicjm
authored andcommitted
net: lib: hostap_crypto: Fix legacy crypto
Legacy crypto has below issues: * PSA RNG is enabled * Compatible with CRYPTO which is now removed, but still works with CRYPTO_ALT due to other modules enabling necessary MbedTLS ciphers. As the difference is only RNG, enable both PSA and Legacy ones, the ROM overhead is just a few bytes, this makes config management simpler. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
1 parent 6e0664e commit c69834f

File tree

1 file changed

+2
-20
lines changed
  • subsys/net/lib/hostap_crypto

1 file changed

+2
-20
lines changed

subsys/net/lib/hostap_crypto/Kconfig

+2-20
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,17 @@ endchoice
1313
choice HOSTAP_CRYPTO_BACKEND
1414
prompt "WPA supplicant crypto implementation"
1515
default HOSTAP_CRYPTO_ALT_PSA if SOC_SERIES_NRF54HX
16-
default HOSTAP_CRYPTO_ALT_LEGACY_PSA if SOC_SERIES_NRF54LX || BUILD_WITH_TFM
17-
default HOSTAP_CRYPTO_ALT_LEGACY
16+
default HOSTAP_CRYPTO_ALT_LEGACY_PSA
1817
help
1918
Select the crypto implementation to use for WPA supplicant.
2019
HOSTAP_CRYPTO_ALT supports enterprise mode
2120
and DPP.
2221

23-
config HOSTAP_CRYPTO_ALT_LEGACY
24-
bool "Legacy Crypto support for WiFi using nRF security"
25-
select MBEDTLS
26-
select NRF_SECURITY
27-
select PSA_WANT_GENERATE_RANDOM
28-
select MBEDTLS_CIPHER_MODE_CBC
29-
select MBEDTLS_CIPHER_MODE_CTR
30-
select MBEDTLS_LEGACY_CRYPTO_C
31-
select MBEDTLS_CIPHER
32-
select MBEDTLS_ECP_C
33-
select MBEDTLS_PK_WRITE_C
34-
select MBEDTLS_HKDF_C
35-
select MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
36-
select MBEDTLS_MD_C
37-
select MBEDTLS_MD5_C
38-
select MBEDTLS_CIPHER_PADDING_PKCS7
39-
select MBEDTLS_PKCS5_C
40-
4122
config HOSTAP_CRYPTO_ALT_LEGACY_PSA
4223
bool "Legacy Crypto support for WiFi using nRF security"
4324
select MBEDTLS
4425
select NRF_SECURITY
26+
# Enable for non-TF-M builds to keep it simple, no overhead
4527
select PSA_WANT_GENERATE_RANDOM
4628
select MBEDTLS_CIPHER_MODE_CBC
4729
select MBEDTLS_CIPHER_MODE_CTR

0 commit comments

Comments
 (0)