Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-08-03 09:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

If MBEDTLS_PSA_DRIVER_GET_ENTROPY is defined, ignore MBEDTLS_PLATFORM_GET_ENTROPY_ALT

Browse Source 
If the new option is defined, ignore the old option that it is gradually
replacing. This lets us transition build scripts gradually, whereby they
still enable MBEDTLS_PLATFORM_GET_ENTROPY_ALT, but the C code translates
this to MBEDTLS_PSA_DRIVER_GET_ENTROPY.

Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2025-07-11 18:33:24 +02:00
parent 79226e358d
commit 6e786d18cb
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/fake_external_rng_for_test.c
+14 -21
View File
@@ -127,12 +127,20 @@ static int fake_get_entropy(unsigned char *output, size_t output_size,
#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT || MBEDTLS_PSA_DRIVER_GET_ENTROPY */
/* Form of the callback introduced in
* https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/212 ,
* never released, superseded by
* https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/307 .
*/
#if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT)
#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags,
size_t *estimate_bits,
unsigned char *output, size_t output_size)
{
/* We don't implement any flags yet. */
if (flags != 0) {
return PSA_ERROR_NOT_SUPPORTED;
}
int ret = fake_get_entropy(output, output_size, estimate_bits);
return ret;
}
#elif defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT)
int mbedtls_platform_get_entropy(unsigned char *output, size_t output_size,
size_t *output_len, size_t *entropy_content)
{
@@ -147,18 +155,3 @@ int mbedtls_platform_get_entropy(unsigned char *output, size_t output_size,
return ret;
}
#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT */
#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags,
size_t *estimate_bits,
unsigned char *output, size_t output_size)
{
/* We don't implement any flags yet. */
if (flags != 0) {
return PSA_ERROR_NOT_SUPPORTED;
}
int ret = fake_get_entropy(output, output_size, estimate_bits);
return ret;
}
#endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */