diff options
author | Jaeden Amero <jaeden.amero@arm.com> | 2019-06-21 13:21:05 +0100 |
---|---|---|
committer | Jaeden Amero <jaeden.amero@arm.com> | 2019-06-21 13:21:05 +0100 |
commit | fd0f65459c9569dfbbcbf31345f022aba1673a8e (patch) | |
tree | 3b4a63e46f6c8fdc562f4489cde565aee02f113f /tests/suites/helpers.function | |
parent | e2d5b9e5cc20fc235cd966523c50b4bf97411f31 (diff) | |
parent | 3097a71d419e8b9e961fb3c193c67601519ec07a (diff) | |
download | mbedtls-fd0f65459c9569dfbbcbf31345f022aba1673a8e.zip mbedtls-fd0f65459c9569dfbbcbf31345f022aba1673a8e.tar.gz mbedtls-fd0f65459c9569dfbbcbf31345f022aba1673a8e.tar.bz2 |
Merge remote-tracking branch 'origin/pr/2697' into development
* origin/pr/2697:
Update crypto submodule
Add all.sh component that exercises invalid_param checks
Remove mbedtls_param_failed from programs
Make it easier to define MBEDTLS_PARAM_FAILED as assert
Make test suites compatible with #include <assert.h>
Pass -m32 to the linker as well
Don't systematically rebuild programs
Diffstat (limited to 'tests/suites/helpers.function')
-rw-r--r-- | tests/suites/helpers.function | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index 8bce913..cf7a1c5 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -215,7 +215,7 @@ typedef enum #define TEST_VALID_PARAM( TEST ) \ TEST_ASSERT( ( TEST, 1 ) ); -#define assert(a) if( !( a ) ) \ +#define TEST_HELPER_ASSERT(a) if( !( a ) ) \ { \ mbedtls_fprintf( stderr, "Assertion Failed at %s:%d - %s\n", \ __FILE__, __LINE__, #a ); \ @@ -381,7 +381,7 @@ int unhexify( unsigned char *obuf, const char *ibuf ) { unsigned char c, c2; int len = strlen( ibuf ) / 2; - assert( strlen( ibuf ) % 2 == 0 ); /* must be even number of bytes */ + TEST_HELPER_ASSERT( strlen( ibuf ) % 2 == 0 ); /* must be even number of bytes */ while( *ibuf != 0 ) { @@ -393,7 +393,7 @@ int unhexify( unsigned char *obuf, const char *ibuf ) else if( c >= 'A' && c <= 'F' ) c -= 'A' - 10; else - assert( 0 ); + TEST_HELPER_ASSERT( 0 ); c2 = *ibuf++; if( c2 >= '0' && c2 <= '9' ) @@ -403,7 +403,7 @@ int unhexify( unsigned char *obuf, const char *ibuf ) else if( c2 >= 'A' && c2 <= 'F' ) c2 -= 'A' - 10; else - assert( 0 ); + TEST_HELPER_ASSERT( 0 ); *obuf++ = ( c << 4 ) | c2; } @@ -448,7 +448,7 @@ static unsigned char *zero_alloc( size_t len ) size_t actual_len = ( len != 0 ) ? len : 1; p = mbedtls_calloc( 1, actual_len ); - assert( p != NULL ); + TEST_HELPER_ASSERT( p != NULL ); memset( p, 0x00, actual_len ); @@ -475,7 +475,7 @@ unsigned char *unhexify_alloc( const char *ibuf, size_t *olen ) return( zero_alloc( *olen ) ); obuf = mbedtls_calloc( 1, *olen ); - assert( obuf != NULL ); + TEST_HELPER_ASSERT( obuf != NULL ); (void) unhexify( obuf, ibuf ); |