Skip to content

Commit 92e6276

Browse files
joerchannordicjm
authored andcommitted
nrf_security: Fix EdDSA and Twisted Edwards curve configurations
Fix PSA EdDSA and Twisted Edwards curver configurations from Kconfig to header definitions. Signed-off-by: Joakim Andersson <[email protected]>
1 parent bd7cda7 commit 92e6276

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

subsys/nrf_security/cmake/psa_crypto_config.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ kconfig_check_and_set_base_to_one(PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS)
5353
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_ECDH)
5454
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_ECDSA)
5555
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
56+
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_PURE_EDDSA)
57+
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_ED25519PH)
58+
kconfig_check_and_set_base_to_one(PSA_WANT_ALG_ED448PH)
5659
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
5760
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
5861
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
5962
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_MONTGOMERY_255)
6063
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_MONTGOMERY_448)
64+
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_TWISTED_EDWARDS_255)
6165
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_SECP_K1_192)
6266
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_SECP_K1_256)
6367
kconfig_check_and_set_base_to_one(PSA_WANT_ECC_SECP_R1_192)

subsys/nrf_security/configs/psa_crypto_config.h.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
#cmakedefine PSA_WANT_ALG_ECB_NO_PADDING @PSA_WANT_ALG_ECB_NO_PADDING@
3131
#cmakedefine PSA_WANT_ALG_ECDH @PSA_WANT_ALG_ECDH@
3232
#cmakedefine PSA_WANT_ALG_ECDSA @PSA_WANT_ALG_ECDSA@
33+
#cmakedefine PSA_WANT_ALG_PURE_EDDSA @PSA_WANT_ALG_PURE_EDDSA@
34+
#cmakedefine PSA_WANT_ALG_ED25519PH @PSA_WANT_ALG_ED25519PH@
35+
#cmakedefine PSA_WANT_ALG_ED448PH @PSA_WANT_ALG_ED448PH@
3336
#cmakedefine PSA_WANT_ALG_GCM @PSA_WANT_ALG_GCM@
3437
#cmakedefine PSA_WANT_ALG_HKDF @PSA_WANT_ALG_HKDF@
3538
#cmakedefine PSA_WANT_ALG_HMAC @PSA_WANT_ALG_HMAC@
@@ -61,6 +64,7 @@
6164
#cmakedefine PSA_WANT_ECC_BRAINPOOL_P_R1_512 @PSA_WANT_ECC_BRAINPOOL_P_R1_512@
6265
#cmakedefine PSA_WANT_ECC_MONTGOMERY_255 @PSA_WANT_ECC_MONTGOMERY_255@
6366
#cmakedefine PSA_WANT_ECC_MONTGOMERY_448 @PSA_WANT_ECC_MONTGOMERY_448@
67+
#cmakedefine PSA_WANT_ECC_TWISTED_EDWARDS_255 @PSA_WANT_ECC_TWISTED_EDWARDS_255@
6468
#cmakedefine PSA_WANT_ECC_SECP_K1_192 @PSA_WANT_ECC_SECP_K1_192@
6569
/*
6670
* SECP224K1 is buggy via the PSA API in Mbed TLS

0 commit comments

Comments
 (0)