yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check MBEDTLS_PK_{PARSE,WRITE}_C requires MBEDTLS_OID_C

Browse source 
- check_config.h: add this dependency check
- mbedtls_config.h: update corresponding requirement documentation

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-12-05 10:31:54 +08:00 committed by Janos Follath
parent 687bfcb54c
commit 5b118d4aed
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mbedtls/check_config.h
View file

@ -436,24 +436,16 @@
#error "MBEDTLS_PK_C defined, but not all prerequisites" #error "MBEDTLS_PK_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_PK_PARSE_C) && !defined(MBEDTLS_PK_C) #if defined(MBEDTLS_PK_PARSE_C) && \
(!defined(MBEDTLS_PK_C) || !defined(MBEDTLS_OID_C))
#error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites" #error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_PK_WRITE_C) && !defined(MBEDTLS_PK_C) #if defined(MBEDTLS_PK_WRITE_C) && \
(!defined(MBEDTLS_PK_C) || !defined(MBEDTLS_OID_C))
#error "MBEDTLS_PK_WRITE_C defined, but not all prerequisites" #error "MBEDTLS_PK_WRITE_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_PK_PARSE_C) && defined(MBEDTLS_PK_HAVE_ECC_KEYS) && \
!defined(MBEDTLS_OID_C)
#error "MBEDTLS_PK_PARSE_C and MBEDTLS_PK_HAVE_ECC_KEYS require MBEDTLS_OID_C"
#endif
#if defined(MBEDTLS_PK_WRITE_C) && defined(MBEDTLS_PK_HAVE_ECC_KEYS) && \
!defined(MBEDTLS_OID_C)
#error "MBEDTLS_PK_WRITE_C and MBEDTLS_PK_HAVE_ECC_KEYS require MBEDTLS_OID_C"
#endif
#if defined(MBEDTLS_PLATFORM_EXIT_ALT) && !defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_EXIT_ALT) && !defined(MBEDTLS_PLATFORM_C)
#error "MBEDTLS_PLATFORM_EXIT_ALT defined, but not all prerequisites" #error "MBEDTLS_PLATFORM_EXIT_ALT defined, but not all prerequisites"
#endif #endif

4
include/mbedtls/mbedtls_config.h
View file

@ -3059,7 +3059,7 @@
* Caller: library/x509_crt.c * Caller: library/x509_crt.c
* library/x509_csr.c * library/x509_csr.c
* *
* Requires: MBEDTLS_PK_C * Requires: MBEDTLS_PK_C, MBEDTLS_OID_C
* *
* Uncomment to enable generic public key parse functions. * Uncomment to enable generic public key parse functions.
*/ */
@ -3073,7 +3073,7 @@
* Module: library/pkwrite.c * Module: library/pkwrite.c
* Caller: library/x509write.c * Caller: library/x509write.c
* *
* Requires: MBEDTLS_PK_C * Requires: MBEDTLS_PK_C, MBEDTLS_OID_C
* *
* Uncomment to enable generic public key write functions. * Uncomment to enable generic public key write functions.
*/ */