commit 072a068f9f184a9b2ede7f4e940ca35e3b49ea3e
author Yanray Wang <yanray.wang@arm.com> Tue Dec 05 10:53:04 2023 +0800
committer Janos Follath <janos.follath@arm.com> Wed Feb 14 16:00:28 2024 +0000
tree 29c1c1e43460babe208564d64e140b10c7b7699c
parent 5b118d4aed8b3e211c00d55c48298aea5f14c03f

check_config: combine check for MBEDTLS_PK_PARSE_C

- check_config.h: combine separate check for MBEDTLS_PK_PARSE_C
- mbedtls_config.h: update documentation for `Requires`

Signed-off-by: Yanray Wang <yanray.wang@arm.com>

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 6aa87b8..1ccd24e 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -207,10 +207,6 @@
 #error "MBEDTLS_ECP_C defined (or a subset enabled), but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_PK_PARSE_C) && !defined(MBEDTLS_ASN1_PARSE_C)
-#error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites"
-#endif
-
 #if defined(MBEDTLS_ENTROPY_C) && \
     !(defined(MBEDTLS_MD_CAN_SHA512) || defined(MBEDTLS_MD_CAN_SHA256))
 #error "MBEDTLS_ENTROPY_C defined, but not all prerequisites"
@@ -437,7 +433,9 @@
 #endif
 
 #if defined(MBEDTLS_PK_PARSE_C) && \
-    (!defined(MBEDTLS_PK_C) || !defined(MBEDTLS_OID_C))
+    (!defined(MBEDTLS_ASN1_PARSE_C) || \
+     !defined(MBEDTLS_OID_C)        || \
+     !defined(MBEDTLS_PK_C))
 #error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites"
 #endif