AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reuse already-defined MBEDTLS_PSA_BUILTIN_HASH

Browse Source 
Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman 2021-03-08 20:28:18 +01:00
parent fbe09284cf
commit 0d58666395
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/psa_crypto_hash.c
View File

@ -68,18 +68,9 @@
#define BUILTIN_ALG_SHA_512 1 #define BUILTIN_ALG_SHA_512 1
#endif #endif
#if ( defined(BUILTIN_ALG_MD2) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD2) ) || \ /* If at least one of the hash algorithms is to be exercised through the
( defined(BUILTIN_ALG_MD4) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD4) ) || \ * transparent test driver, then the mbedtls_transparent_test_driver_hash_*
( defined(BUILTIN_ALG_MD5) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD5) ) || \ * entry points need to be implemented. */
( defined(BUILTIN_ALG_RIPEMD160) && !defined(MBEDTLS_PSA_ACCEL_ALG_RIPEMD160) ) || \
( defined(BUILTIN_ALG_SHA_1) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_1) ) || \
( defined(BUILTIN_ALG_SHA_224) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_224) ) || \
( defined(BUILTIN_ALG_SHA_256) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_256) ) || \
( defined(BUILTIN_ALG_SHA_384) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_384) ) || \
( defined(BUILTIN_ALG_SHA_512) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_512) )
#define INCLUDE_HASH_MBEDTLS_DRIVER 1
#endif
#if defined(PSA_CRYPTO_DRIVER_TEST) && \ #if defined(PSA_CRYPTO_DRIVER_TEST) && \
( defined(MBEDTLS_PSA_ACCEL_ALG_MD2) || \ ( defined(MBEDTLS_PSA_ACCEL_ALG_MD2) || \
defined(MBEDTLS_PSA_ACCEL_ALG_MD4) || \ defined(MBEDTLS_PSA_ACCEL_ALG_MD4) || \
@ -93,7 +84,9 @@
#define INCLUDE_HASH_TEST_DRIVER #define INCLUDE_HASH_TEST_DRIVER
#endif #endif
#if defined(INCLUDE_HASH_MBEDTLS_DRIVER) || \ /* If either of the built-in or test driver entry points need to be implemented, then
* the core implementation should be present. */
#if defined(MBEDTLS_PSA_BUILTIN_HASH) || \
defined(INCLUDE_HASH_TEST_DRIVER) defined(INCLUDE_HASH_TEST_DRIVER)
#define INCLUDE_HASH_CORE 1 #define INCLUDE_HASH_CORE 1
#endif #endif
@ -511,7 +504,7 @@ exit:
} }
#endif /* INCLUDE_HASH_CORE */ #endif /* INCLUDE_HASH_CORE */
#if defined(INCLUDE_HASH_MBEDTLS_DRIVER) #if defined(MBEDTLS_PSA_BUILTIN_HASH)
psa_status_t mbedtls_psa_hash_compute( psa_status_t mbedtls_psa_hash_compute(
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t *input, const uint8_t *input,
@ -560,7 +553,7 @@ psa_status_t mbedtls_psa_hash_abort(
{ {
return( hash_abort( operation ) ); return( hash_abort( operation ) );
} }
#endif /* INCLUDE_HASH_MBEDTLS_DRIVER */ #endif /* MBEDTLS_PSA_BUILTIN_HASH */
/* /*
* BEYOND THIS POINT, TEST DRIVER ENTRY POINTS ONLY. * BEYOND THIS POINT, TEST DRIVER ENTRY POINTS ONLY.