mirror of
https://github.com/cuberite/polarssl.git
synced 2025-09-08 23:03:06 -04:00
Add missing definition of AT_LEAST_ONE_BUILTIN_KDF
Signed-off-by: Pengyu Lv <pengyu.lv@arm.com> Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
parent
3ee4e648db
commit
57cd7a8292
@ -13,6 +13,19 @@
|
||||
#include "psa/internal_trusted_storage.h"
|
||||
#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 */
|
||||
@ -714,7 +727,7 @@ static int smoke_test_key(mbedtls_svc_key_id_t key)
|
||||
buffer, sizeof(buffer), NULL, 0,
|
||||
buffer, sizeof(buffer), &length));
|
||||
|
||||
#if defined(MBEDTLS_SHA256_C)
|
||||
#if defined(MBEDTLS_SHA256_C) && defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF)
|
||||
/* Try the key in a plain key derivation. */
|
||||
PSA_ASSERT(psa_key_derivation_setup(&derivation_operation,
|
||||
PSA_ALG_HKDF(PSA_ALG_SHA_256)));
|
||||
@ -747,7 +760,9 @@ static int smoke_test_key(mbedtls_svc_key_id_t key)
|
||||
alg, key, buffer, length,
|
||||
buffer, sizeof(buffer), &length));
|
||||
}
|
||||
#endif /* MBEDTLS_SHA256_C */
|
||||
#else
|
||||
(void) derivation_operation;
|
||||
#endif /* MBEDTLS_SHA256_C && MBEDTLS_PSA_BUILTIN_ALG_HKDF */
|
||||
|
||||
ok = 1;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user