Skip to content

Commit e9cbfd5

Browse files
committed
nrf_security: Use PSA_PROMPTLESS instead of MBEDTLS_PROMPTLESS
In the Kconfig.psa.nordic file because this file is meant to be used with PSA it makes sense to use PSA_PROMPTLESS. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
1 parent bc57df4 commit e9cbfd5

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

subsys/nrf_security/Kconfig.psa.nordic

+19-19
Original file line numberDiff line numberDiff line change
@@ -307,37 +307,37 @@ config PSA_WANT_ALG_SHAKE256_512
307307
default y if PSA_CRYPTO_ENABLE_ALL
308308

309309
config PSA_WANT_ALG_AES_KW
310-
bool "AES key wrap support (NIST-SP-800-38F and RFC3394) [EXPERIMENTAL]" if !MBEDTLS_PROMPTLESS
310+
bool "AES key wrap support (NIST-SP-800-38F and RFC3394) [EXPERIMENTAL]" if !PSA_PROMPTLESS
311311
select EXPERIMENTAL
312312

313313
config PSA_WANT_ALG_AES_KWP
314-
bool "AES key wrap with padding support (NIST-SP-800-38F and RFC5649) [EXPERIMENTAL]" if !MBEDTLS_PROMPTLESS
314+
bool "AES key wrap with padding support (NIST-SP-800-38F and RFC5649) [EXPERIMENTAL]" if !PSA_PROMPTLESS
315315
select EXPERIMENTAL
316316

317317
config PSA_WANT_ALG_WPA3_SAE_PT
318-
bool "WPA3-SAE-PT support [EXPERIMENTAL]" if !MBEDTLS_PROMPTLESS
318+
bool "WPA3-SAE-PT support [EXPERIMENTAL]" if !PSA_PROMPTLESS
319319
select EXPERIMENTAL
320320

321321
config PSA_WANT_ALG_WPA3_SAE
322-
bool "WPA3-SAE support [EXPERIMENTAL]" if !MBEDTLS_PROMPTLESS
322+
bool "WPA3-SAE support [EXPERIMENTAL]" if !PSA_PROMPTLESS
323323
select EXPERIMENTAL
324324

325325
config PSA_WANT_ALG_SP800_108_COUNTER_CMAC
326-
bool "NIST SP 800-108 conformant CMAC based KDF" if !MBEDTLS_PROMPTLESS
326+
bool "NIST SP 800-108 conformant CMAC based KDF" if !PSA_PROMPTLESS
327327

328328
config PSA_WANT_ALG_SP800_108_COUNTER_HMAC
329-
bool "NIST SP 800-108 conformant HMAC based KDF" if !MBEDTLS_PROMPTLESS
329+
bool "NIST SP 800-108 conformant HMAC based KDF" if !PSA_PROMPTLESS
330330

331331
comment "Nordic addded RNG configuration"
332332

333333
config PSA_WANT_GENERATE_RANDOM
334-
bool "PSA RNG support" if !MBEDTLS_PROMPTLESS
334+
bool "PSA RNG support" if !PSA_PROMPTLESS
335335
default y if PSA_CRYPTO_ENABLE_ALL
336336

337337
comment "Nordic added key types"
338338

339339
config PSA_WANT_KEY_TYPE_PEPPER
340-
bool "PSA pepper key type support" if !MBEDTLS_PROMPTLESS
340+
bool "PSA pepper key type support" if !PSA_PROMPTLESS
341341
default y if PSA_CRYPTO_ENABLE_ALL
342342

343343
config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC
@@ -351,35 +351,35 @@ config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC
351351
SPAKE2+ key pair: Basic key support
352352

353353
config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_IMPORT
354-
bool "SPAKE2+ key pair import support" if !MBEDTLS_PROMPTLESS
354+
bool "SPAKE2+ key pair import support" if !PSA_PROMPTLESS
355355
select PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY
356356
default y if PSA_CRYPTO_ENABLE_ALL
357357
help
358358
SPAKE2+ key pair: Import key for both the private and public key.
359359

360360
config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_EXPORT
361-
bool "SPAKE2+ key pair export support" if !MBEDTLS_PROMPTLESS
361+
bool "SPAKE2+ key pair export support" if !PSA_PROMPTLESS
362362
select PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY
363363
default y if PSA_CRYPTO_ENABLE_ALL
364364
help
365365
SPAKE2+ key pair: Export key for both the private and public key.
366366

367367
config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_GENERATE
368-
bool "SPAKE2+ key pair generate support" if !MBEDTLS_PROMPTLESS
368+
bool "SPAKE2+ key pair generate support" if !PSA_PROMPTLESS
369369
select PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY
370370
default y if PSA_CRYPTO_ENABLE_ALL
371371
help
372372
SPAKE2+ key pair: Generate key for both the private and public key.
373373

374374
config PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE
375-
bool "SPAKE2+ key pair derive support" if !MBEDTLS_PROMPTLESS
375+
bool "SPAKE2+ key pair derive support" if !PSA_PROMPTLESS
376376
select PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY
377377
default y if PSA_CRYPTO_ENABLE_ALL
378378
help
379379
SPAKE2+ key pair: Derive key for both the private and public key.
380380

381381
config PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY
382-
bool "SPAKE2+ public key support" if !MBEDTLS_PROMPTLESS
382+
bool "SPAKE2+ public key support" if !PSA_PROMPTLESS
383383
default y if PSA_CRYPTO_ENABLE_ALL
384384
help
385385
SPAKE2+ public key support.
@@ -393,37 +393,37 @@ config PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC
393393
PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_DERIVE
394394

395395
config PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_IMPORT
396-
bool "SRP key pair import support" if !MBEDTLS_PROMPTLESS
396+
bool "SRP key pair import support" if !PSA_PROMPTLESS
397397
select PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
398398
default y if PSA_CRYPTO_ENABLE_ALL
399399
help
400400
SRP key pair: import key for both the private and public key.
401401

402402
config PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_EXPORT
403-
bool "SRP key pair export support" if !MBEDTLS_PROMPTLESS
403+
bool "SRP key pair export support" if !PSA_PROMPTLESS
404404
select PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
405405
default y if PSA_CRYPTO_ENABLE_ALL
406406
help
407407
SRP key pair: export key for both the private and public key.
408408

409409
config PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_GENERATE
410-
bool "SRP key pair export support" if !MBEDTLS_PROMPTLESS
410+
bool "SRP key pair export support" if !PSA_PROMPTLESS
411411
select PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
412412
default y if PSA_CRYPTO_ENABLE_ALL
413413
help
414414
SRP key pair: export key for both the private and public key.
415415

416416
config PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_DERIVE
417-
bool "SRP key pair derive support" if !MBEDTLS_PROMPTLESS
417+
bool "SRP key pair derive support" if !PSA_PROMPTLESS
418418
select PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
419419
default y if PSA_CRYPTO_ENABLE_ALL
420420
help
421421
SRP key pair: derive key for both the private and public key.
422422

423423
config PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
424-
bool "SRP public key support" if !MBEDTLS_PROMPTLESS
424+
bool "SRP public key support" if !PSA_PROMPTLESS
425425
help
426426
SRP public key support.
427427

428428
config PSA_WANT_KEY_TYPE_WPA3_SAE_PT
429-
bool "WPA3-SAE-PT key support" if !MBEDTLS_PROMPTLESS
429+
bool "WPA3-SAE-PT key support" if !PSA_PROMPTLESS

0 commit comments

Comments
 (0)