From 0577e46143bf443d8fdbdeeefb220cef021df091 Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Fri, 21 Jul 2023 13:00:53 +0200 Subject: [PATCH] nrf_security: Fix missing KDF dependency on EC-JPake to MS algorithm Fix missing dependency for key derivation driver when EC-JPake algorithm is enabled. Signed-off-by: Joakim Andersson --- subsys/nrf_security/include/psa/psa_crypto_config_oberon.h | 1 + subsys/nrf_security/src/drivers/nrf_oberon/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/subsys/nrf_security/include/psa/psa_crypto_config_oberon.h b/subsys/nrf_security/include/psa/psa_crypto_config_oberon.h index c6eb1ec48ff9..484075777539 100644 --- a/subsys/nrf_security/include/psa/psa_crypto_config_oberon.h +++ b/subsys/nrf_security/include/psa/psa_crypto_config_oberon.h @@ -204,5 +204,6 @@ #endif #if defined(PSA_CRYPTO_DRIVER_ALG_TLS12_ECJPAKE_TO_PMS_OBERON) +#define PSA_NEED_OBERON_KDF_DRIVER 1 #define PSA_NEED_OBERON_ECJPAKE_TO_PMS 1 #endif diff --git a/subsys/nrf_security/src/drivers/nrf_oberon/Kconfig b/subsys/nrf_security/src/drivers/nrf_oberon/Kconfig index d3a281aa75c0..edd675d1949d 100644 --- a/subsys/nrf_security/src/drivers/nrf_oberon/Kconfig +++ b/subsys/nrf_security/src/drivers/nrf_oberon/Kconfig @@ -53,7 +53,8 @@ config PSA_CRYPTO_DRIVER_HAS_KDF_SUPPORT_OBERON PSA_CRYPTO_DRIVER_ALG_TLS12_PRF_OBERON || \ PSA_CRYPTO_DRIVER_ALG_PBKDF2_HMAC_OBERON || \ PSA_CRYPTO_DRIVER_ALG_PBKDF2_AES_CMAC_PRF_128_OBERON || \ - PSA_CRYPTO_DRIVER_ALG_TLS12_PSK_TO_MS_OBERON + PSA_CRYPTO_DRIVER_ALG_TLS12_PSK_TO_MS_OBERON || \ + PSA_CRYPTO_DRIVER_ALG_TLS12_ECJPAKE_TO_PMS_OBERON config PSA_CRYPTO_DRIVER_HAS_ASYM_ENCRYPT_SUPPORT_OBERON bool