diff options
| author | Ronald Cron <ronald.cron@arm.com> | 2021-06-14 16:17:32 +0200 |
|---|---|---|
| committer | Ronald Cron <ronald.cron@arm.com> | 2021-06-14 16:17:32 +0200 |
| commit | c4c761e35e179823c87b97e892b8de5f76e41700 (patch) | |
| tree | b13c82578b47022829bc9345857006e5da886220 /tests/suites/helpers.function | |
| parent | a90e0907c51241556e07c83b581903302b617c13 (diff) | |
| parent | 21f84643f888acf37de853898efb02dcd179afc3 (diff) | |
| download | mbedtls-c4c761e35e179823c87b97e892b8de5f76e41700.zip mbedtls-c4c761e35e179823c87b97e892b8de5f76e41700.tar.gz mbedtls-c4c761e35e179823c87b97e892b8de5f76e41700.tar.bz2 | |
Merge remote-tracking branch 'mbedtls/development' into mbedtls_private_with_python
Conflicts:
include/mbedtls/ssl.h
include/psa/crypto_struct.h
Conflicts fixed by using the code from development branch
and manually re-applying the MBEDTLS_PRIVATE wrapping.
Diffstat (limited to 'tests/suites/helpers.function')
| -rw-r--r-- | tests/suites/helpers.function | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index 2a75752..7481c5b 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -31,11 +31,6 @@ #include "mbedtls/memory_buffer_alloc.h" #endif -#if defined(MBEDTLS_CHECK_PARAMS) -#include "mbedtls/platform_util.h" -#include <setjmp.h> -#endif - #ifdef _MSC_VER #include <basetsd.h> typedef UINT8 uint8_t; @@ -81,10 +76,6 @@ typedef struct data_tag /*----------------------------------------------------------------------------*/ /* Global variables */ -#if defined(MBEDTLS_CHECK_PARAMS) -jmp_buf jmp_tmp; -#endif - /*----------------------------------------------------------------------------*/ /* Helper flags for complex dependencies */ |