commit 42c30e6a6ef5219e698322cd38215a362feb9e60
author Ronald Cron <ronald.cron@arm.com> Mon Sep 02 15:22:29 2024 +0200
committer Ronald Cron <ronald.cron@arm.com> Wed Sep 04 08:35:34 2024 +0200
tree 47e0f2785b128cf841eac380b762af6c1203fcde
parent 61391063b680e11eb81c5f7f90b9ac39c92e03de

Move DRBG options

Move DRBG options to the
"Cryptographic mechanism selection (extended API)"
section.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

docs/proposed/config-split.md

diff --git a/docs/proposed/config-split.md b/docs/proposed/config-split.md
index a6b1a01..17a4e7b 100644
--- a/docs/proposed/config-split.md
+++ b/docs/proposed/config-split.md
@@ -157,7 +157,6 @@
 
 * SECTION "PSA core"
 //#define MBEDTLS_ENTROPY_HARDWARE_ALT
-//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY
 //#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
 //#define MBEDTLS_NO_PLATFORM_ENTROPY
 //#define MBEDTLS_ENTROPY_FORCE_SHA256
@@ -170,24 +169,12 @@
 //#define MBEDTLS_PSA_CRYPTO_SPM
 //#define MBEDTLS_PSA_INJECT_ENTROPY
 //#define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
-#define MBEDTLS_CTR_DRBG_C
 #define MBEDTLS_ENTROPY_C
-#define MBEDTLS_HMAC_DRBG_C
 #define MBEDTLS_PSA_CRYPTO_STORAGE_C
 #define MBEDTLS_PSA_ITS_FILE_C
 //#define MBEDTLS_PSA_CRYPTO_PLATFORM_FILE "psa/crypto_platform_alt.h"
 //#define MBEDTLS_PSA_CRYPTO_STRUCT_FILE "psa/crypto_struct_alt.h"
 //#define MBEDTLS_PSA_KEY_SLOT_COUNT 32
-//#define MBEDTLS_PSA_HMAC_DRBG_MD_TYPE MBEDTLS_MD_SHA256
-//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48
-//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000
-//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256
-//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024
-//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384
-//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000
-//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256
-//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024
-//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384
 //#define MBEDTLS_ENTROPY_MAX_SOURCES                20
 //#define MBEDTLS_ENTROPY_MAX_GATHER                128
 //#define MBEDTLS_ENTROPY_MIN_HARDWARE               32
@@ -230,6 +217,9 @@
 
 * SECTION "Cryptographic mechanism selection (extended API)"
 #define MBEDTLS_CIPHER_C
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_HMAC_DRBG_C
 #define MBEDTLS_LMS_C
 //#define MBEDTLS_LMS_PRIVATE
 #define MBEDTLS_MD_C
@@ -243,6 +233,17 @@
 #define MBEDTLS_PKCS5_C
 #define MBEDTLS_PKCS12_C
 
+//#define MBEDTLS_PSA_HMAC_DRBG_MD_TYPE MBEDTLS_MD_SHA256
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384
+
 
 * SECTION "Data format support"
 #define MBEDTLS_ASN1_PARSE_C