[nrf noup] Revert "modules: mbedtls: fix entropy polling"

This reverts commit 21ee827.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

Author: tomi-font

modules/mbedtls/Kconfig.tf-psa-crypto

@@ -278,6 +278,7 @@ comment "Random number generators"
 config MBEDTLS_CTR_DRBG_C
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
+	default y
 
 config MBEDTLS_HMAC_DRBG_C
 	bool "HMAC_DRBG random generator"
@@ -357,14 +358,13 @@ config MBEDTLS_HAVE_ASM
 
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
-	select PSA_WANT_ALG_SHA_256 if !PSA_WANT_ALG_SHA_512
+	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
 	help
 	  This module gathers entropy data from enabled entropy sources. It's
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
-	  It requires either PSA_WANT_ALG_SHA_256 or PSA_WANT_ALG_SHA_512.
 
-config MBEDTLS_PSA_DRIVER_GET_ENTROPY
+config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	default y
 	depends on MBEDTLS_ENTROPY_C

modules/mbedtls/configs/config-tf-psa-crypto.h

@@ -25,6 +25,7 @@
 #define MBEDTLS_MEMORY_BUFFER_ALLOC_C
 #define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
 #define MBEDTLS_PLATFORM_EXIT_ALT
+#define MBEDTLS_NO_PLATFORM_ENTROPY
 
 #if defined(CONFIG_MBEDTLS_ZEROIZE_ALT)
 #define MBEDTLS_PLATFORM_ZEROIZE_ALT
@@ -38,8 +39,10 @@
 #define MBEDTLS_PLATFORM_SNPRINTF_ALT
 #endif /* defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) */
 
-#if defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
-#define MBEDTLS_PSA_DRIVER_GET_ENTROPY
+#if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+#else
+#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
 #endif
 
 #if defined(CONFIG_MBEDTLS_HAVE_ASM)

modules/mbedtls/zephyr_entropy.c

@@ -5,15 +5,14 @@
  */
 
 #include <zephyr/random/random.h>
+#include <mbedtls/entropy.h>
 #include <psa/crypto.h>
-#include <mbedtls/platform.h>
 
 
-#if defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY) || \
-    defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
+#if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR) || defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
 static int get_random_data(uint8_t *output, size_t output_size, bool allow_non_cs)
 {
-	int ret = -EINVAL;
+	int ret = MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED;
 
 #if defined(CONFIG_CSPRNG_ENABLED)
 	ret = sys_csrand_get(output, output_size);
@@ -29,24 +28,31 @@ static int get_random_data(uint8_t *output, size_t output_size, bool allow_non_c
 
 	return ret;
 }
-#endif /* CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY || CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
+#endif /* CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR || CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
 
-#if defined(CONFIG_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)
+#if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len,
+			  size_t *olen)
 {
-	ARG_UNUSED(flags);
+	int ret;
+	uint16_t request_len = len > UINT16_MAX ? UINT16_MAX : len;
+
+	ARG_UNUSED(data);
+
+	if (output == NULL || olen == NULL || len == 0) {
+		return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
+	}
 
-	if (get_random_data(output, output_size, true) < 0) {
-		return -EIO;
+	ret = get_random_data(output, len, true);
+	if (ret < 0) {
+		return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
 	}
 
-	*estimate_bits = 8 * output_size;
+	*olen = request_len;
 
 	return 0;
 }
-#endif /* CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY */
+#endif /* CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR */
 
 #if defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
 psa_status_t mbedtls_psa_external_get_random(

modules/mbedtls/zephyr_init.c

@@ -12,10 +12,8 @@
  */
 
 #include <zephyr/init.h>
-#include <zephyr/kernel.h>
 #include <zephyr/app_memory/app_memdomain.h>
 #include <mbedtls/platform_time.h>
-#include <errno.h>
 
 #include <mbedtls/debug.h>