From c6654fc1b0b91413ca4c46f6a430096f6c4288c4 Mon Sep 17 00:00:00 2001 From: Felix Conway Date: Wed, 4 Jun 2025 14:54:58 +0100 Subject: [PATCH 1/4] Replace MBEDTLS_ERR_ECP_IN_PROGRESS with alias PSA_OPERATION_INCOMPLETE in documentation Signed-off-by: Felix Conway --- include/mbedtls/x509_crt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h index 8a220cd414..de91499365 100644 --- a/include/mbedtls/x509_crt.h +++ b/include/mbedtls/x509_crt.h @@ -733,7 +733,7 @@ int mbedtls_x509_crt_verify_with_profile(mbedtls_x509_crt *crt, * to disable restartable ECC. * * \return See \c mbedtls_crt_verify_with_profile(), or - * \return #MBEDTLS_ERR_ECP_IN_PROGRESS if maximum number of + * \return #PSA_OPERATION_INCOMPLETE if maximum number of * operations was reached: see \c mbedtls_ecp_set_max_ops(). */ int mbedtls_x509_crt_verify_restartable(mbedtls_x509_crt *crt, From 4f94ae8baa64479d11d6f839c73ff2fb54b86b3b Mon Sep 17 00:00:00 2001 From: Felix Conway Date: Wed, 4 Jun 2025 14:55:45 +0100 Subject: [PATCH 2/4] Doxygen: only render public files Signed-off-by: Felix Conway --- doxygen/mbedtls.doxyfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doxygen/mbedtls.doxyfile b/doxygen/mbedtls.doxyfile index cd52300b02..78c22052ab 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -6,10 +6,7 @@ EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES CASE_SENSE_NAMES = NO -INPUT = ../include ../tf-psa-crypto/include input ../tf-psa-crypto/drivers/builtin/include ../tests/include/alt-dummy -EXCLUDE = \ - ../tf-psa-crypto/drivers/builtin/include/mbedtls/build_info.h \ - ../tf-psa-crypto/drivers/builtin/include/mbedtls/oid.h +INPUT = ../include ../tf-psa-crypto/include ../tests/include/alt-dummy FILE_PATTERNS = *.h RECURSIVE = YES EXCLUDE_SYMLINKS = YES From 1704578f2fab6195983b52f1c1e079c1e78550a0 Mon Sep 17 00:00:00 2001 From: Felix Conway Date: Wed, 4 Jun 2025 14:57:21 +0100 Subject: [PATCH 3/4] Update tf-psa-crypto pointer to bring in doxygen pre-work Signed-off-by: Felix Conway --- tf-psa-crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf-psa-crypto b/tf-psa-crypto index d056817e03..694fa1b81c 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit d056817e037e350320519613848309559909f581 +Subproject commit 694fa1b81cce46e8e160c8bda1a700f8c2a68586 From 035247d46f3a847b279659e4b8739fad6aaeb62a Mon Sep 17 00:00:00 2001 From: Felix Conway Date: Wed, 11 Jun 2025 11:07:10 +0100 Subject: [PATCH 4/4] Re-add doxygen/input to INPUT variable Signed-off-by: Felix Conway --- doxygen/mbedtls.doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doxygen/mbedtls.doxyfile b/doxygen/mbedtls.doxyfile index 78c22052ab..cc2c51eba7 100644 --- a/doxygen/mbedtls.doxyfile +++ b/doxygen/mbedtls.doxyfile @@ -6,7 +6,7 @@ EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES CASE_SENSE_NAMES = NO -INPUT = ../include ../tf-psa-crypto/include ../tests/include/alt-dummy +INPUT = ../include input ../tf-psa-crypto/include ../tests/include/alt-dummy FILE_PATTERNS = *.h RECURSIVE = YES EXCLUDE_SYMLINKS = YES