Add missing definition of AT_LEAST_ONE_BUILTIN_KDF

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
This commit is contained in:
Pengyu Lv 2023-12-04 14:22:09 +08:00 committed by Manuel Pégourié-Gonnard
parent 7cca290120
commit 03fe253533

View File

@ -13,6 +13,19 @@
#include "psa/internal_trusted_storage.h" #include "psa/internal_trusted_storage.h"
#endif #endif
/* Same in library/psa_crypto.c */
#if defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXTRACT) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXPAND)
#define BUILTIN_ALG_ANY_HKDF 1
#endif
#if defined(BUILTIN_ALG_ANY_HKDF) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_ECJPAKE_TO_PMS) || \
defined(PSA_HAVE_SOFT_PBKDF2)
#define AT_LEAST_ONE_BUILTIN_KDF
#endif
/****************************************************************/ /****************************************************************/
/* Test driver helpers */ /* Test driver helpers */
@ -720,7 +733,7 @@ static int smoke_test_key(mbedtls_svc_key_id_t key)
buffer, sizeof(buffer), NULL, 0, buffer, sizeof(buffer), NULL, 0,
buffer, sizeof(buffer), &length)); buffer, sizeof(buffer), &length));
#if defined(PSA_WANT_ALG_SHA_256) #if defined(PSA_WANT_ALG_SHA_256) & defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF)
/* Try the key in a plain key derivation. */ /* Try the key in a plain key derivation. */
PSA_ASSERT(psa_key_derivation_setup(&derivation_operation, PSA_ASSERT(psa_key_derivation_setup(&derivation_operation,
PSA_ALG_HKDF(PSA_ALG_SHA_256))); PSA_ALG_HKDF(PSA_ALG_SHA_256)));
@ -753,7 +766,9 @@ static int smoke_test_key(mbedtls_svc_key_id_t key)
alg, key, buffer, length, alg, key, buffer, length,
buffer, sizeof(buffer), &length)); buffer, sizeof(buffer), &length));
} }
#endif /* PSA_WANT_ALG_SHA_256 */ #else
(void) derivation_operation;
#endif /* PSA_WANT_ALG_SHA_256 & PSA_WANT_ALG_HKDF */
ok = 1; ok = 1;