commit ef01852d65987a461621b06306d80cb42be6ed0e
author Chris Jones <christopher.jones@arm.com> Mon Apr 12 17:27:18 2021 +0100
committer Chris Jones <christopher.jones@arm.com> Tue Apr 13 15:27:04 2021 +0100
tree 45044075e517a697283e911276d22084f27b6036
parent abded0ed39a1d144755595d04782306c0071694f

Add missing guard to mbedtls_test_hook_error_add

Add a missing guard for the definition and declaration of
mbedtls_test_hook_error_add.

Also make the declaration always visible when MBEDTLS_TEST_HOOKS is
enabled. This fixes an issue when MBEDTLS_ERROR_C is not defined but
MBEDTLS_TEST_HOOKS is.

Signed-off-by: Chris Jones <christopher.jones@arm.com>

include/mbedtls/error.h

diff --git a/include/mbedtls/error.h b/include/mbedtls/error.h
index 6242289..49c3120 100644
--- a/include/mbedtls/error.h
+++ b/include/mbedtls/error.h
@@ -123,11 +123,13 @@
 #define MBEDTLS_ERROR_ADD( high, low ) \
         mbedtls_error_add_ext( high, low, __FILE__, __LINE__ )
 
+#if defined(MBEDTLS_TEST_HOOKS)
 /**
  * \brief Testing hook called before adding/combining two error codes together.
  *        Only used when invasive testing is enabled via MBEDTLS_TEST_HOOKS.
  */
 extern void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
+#endif
 
 /**
  * \brief Combines a high-level and low-level error code together.

library/error.c

diff --git a/library/error.c b/library/error.c
index b5bd8d7..afad389 100644
--- a/library/error.c
+++ b/library/error.c
@@ -893,8 +893,6 @@
     return( NULL );
 }
 
-void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
-
 void mbedtls_strerror( int ret, char *buf, size_t buflen )
 {
     size_t len;
@@ -975,4 +973,8 @@
 
 #endif /* MBEDTLS_ERROR_C */
 
+#if defined(MBEDTLS_TEST_HOOKS)
+void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
+#endif
+
 #endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */

scripts/data_files/error.fmt

diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt
index 7fed598..3be94bd 100644
--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@@ -82,8 +82,6 @@
     return( NULL );
 }
 
-void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
-
 void mbedtls_strerror( int ret, char *buf, size_t buflen )
 {
     size_t len;
@@ -164,4 +162,8 @@
 
 #endif /* MBEDTLS_ERROR_C */
 
+#if defined(MBEDTLS_TEST_HOOKS)
+void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
+#endif
+
 #endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */