Skip to content

Commit bdb0768

Browse files
fengming-yenashif
authored andcommitted
hostap: remove CONFIG_NO_PBKDF2 and CONFIG_NO_CONFIG_BLOBS in cmake
Remove CONFIG_NO_PBKDF2 and CONFIG_NO_CONFIG_BLOBS definition and let them be decided in kconfig. CONFIG_NO_PBKDF2 is default y when crypto backend is WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE. CONFIG_NO_CONFIG_BLOBS is default y when both DPP and enterprise disable. Signed-off-by: Fengming Ye <[email protected]>
1 parent 271d708 commit bdb0768

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

modules/hostap/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ zephyr_library_compile_definitions(
2525
TLS_DEFAULT_CIPHERS=\""DEFAULT:!EXP:!LOW"\"
2626
CONFIG_SME
2727
CONFIG_NO_CONFIG_WRITE
28-
CONFIG_NO_CONFIG_BLOBS
2928
CONFIG_CTRL_IFACE
3029
CONFIG_NO_RANDOM_POOL
3130
CONFIG_SHA256
@@ -76,10 +75,6 @@ zephyr_library_include_directories(
7675
${ZEPHYR_BASE}/include/net
7776
)
7877

79-
zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO
80-
CONFIG_NO_PBKDF2
81-
)
82-
8378
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_NO_DEBUG
8479
CONFIG_NO_STDOUT_DEBUG
8580
)

modules/hostap/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ config NO_CONFIG_WRITE
228228

229229
config NO_CONFIG_BLOBS
230230
bool
231-
default y
231+
default y if !WIFI_NM_WPA_SUPPLICANT_DPP && !WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
232232

233233
config CTRL_IFACE
234234
bool
@@ -251,7 +251,7 @@ config NO_WPA
251251

252252
config NO_PBKDF2
253253
bool
254-
default y
254+
default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
255255

256256
config SAE_PK
257257
bool

0 commit comments

Comments
 (0)