Move `MBEDTLS_ERR_ADD` macro and functions to `error.*`
`error.c` and error.h are the more logical place to keep this code and it
prevents issues with building `common.c` and conflicts with other projects
that use mbedtls (such as mbedOS).
`error.c` has been automatically generated by first adding the code to
`error.fmt` and then running `./scripts/generate_errors.pl`.
Also add parenthesis to the addition in `MBEDTLS_ERR_ADD`.
Signed-off-by: Chris Jones <christopher.jones@arm.com>
diff --git a/library/common.h b/library/common.h
index a9b6187..5845766 100644
--- a/library/common.h
+++ b/library/common.h
@@ -29,7 +29,6 @@
#include "mbedtls/config.h"
#endif
-#if defined(MBEDTLS_TEST_HOOKS)
/** Helper to define a function as static except when building invasive tests.
*
* If a function is only used inside its own source file and should be
@@ -45,31 +44,10 @@
* #endif
* ```
*/
+#if defined(MBEDTLS_TEST_HOOKS)
#define MBEDTLS_STATIC_TESTABLE
-
-/** Helper macro and function to combine a high and low level error code.
- *
- * This function uses a hook (`mbedtls_test_err_add_hook`) to allow invasive
- * testing of its inputs. This is used in the test infrastructure to report
- * on errors when combining two error codes of the same level (e.g: two high
- * or two low level errors).
- *
- * To set a hook use
- * ```
- * mbedtls_set_err_add_hook(&mbedtls_check_foo);
- * ```
- */
-void mbedtls_set_err_add_hook( void *hook );
-int mbedtls_err_add( int high, int low, const char *file, int line );
-#define MBEDTLS_ERR_ADD( high, low ) \
- ( mbedtls_err_add( high, low, __FILE__, __LINE__ ) )
-
#else
#define MBEDTLS_STATIC_TESTABLE static
-
-#define MBEDTLS_ERR_ADD( high, low ) \
- ( high + low )
-
-#endif /* MBEDTLS_TEST_HOOKS */
+#endif
#endif /* MBEDTLS_LIBRARY_COMMON_H */