tests: Move generic helper functions
Move generic helper functions from helpers.functions
to helpers.c
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/tests/include/test/helpers.h b/tests/include/test/helpers.h
index 289f04a..9194ada 100644
--- a/tests/include/test/helpers.h
+++ b/tests/include/test/helpers.h
@@ -32,4 +32,51 @@
#include MBEDTLS_CONFIG_FILE
#endif
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_fprintf fprintf
+#define mbedtls_snprintf snprintf
+#define mbedtls_calloc calloc
+#define mbedtls_free free
+#define mbedtls_exit exit
+#define mbedtls_time time
+#define mbedtls_time_t time_t
+#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
+#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+int platform_setup( void );
+void platform_teardown( void );
+
+int unhexify( unsigned char *obuf, const char *ibuf );
+void hexify( unsigned char *obuf, const unsigned char *ibuf, int len );
+
+/**
+ * Allocate and zeroize a buffer.
+ *
+ * If the size if zero, a pointer to a zeroized 1-byte buffer is returned.
+ *
+ * For convenience, dies if allocation fails.
+ */
+unsigned char *zero_alloc( size_t len );
+
+/**
+ * Allocate and fill a buffer from hex data.
+ *
+ * The buffer is sized exactly as needed. This allows to detect buffer
+ * overruns (including overreads) when running the test suite under valgrind.
+ *
+ * If the size if zero, a pointer to a zeroized 1-byte buffer is returned.
+ *
+ * For convenience, dies if allocation fails.
+ */
+unsigned char *unhexify_alloc( const char *ibuf, size_t *olen );
+
+int hexcmp( uint8_t * a, uint8_t * b, uint32_t a_len, uint32_t b_len );
+
#endif /* TEST_HELPERS_H */
diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index 2258e55..b5ca1f8 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -17,3 +17,132 @@
*/
#include <test/helpers.h>
+#include <test/macros.h>
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+static mbedtls_platform_context platform_ctx;
+#endif
+
+int platform_setup( void )
+{
+ int ret = 0;
+#if defined(MBEDTLS_PLATFORM_C)
+ ret = mbedtls_platform_setup( &platform_ctx );
+#endif /* MBEDTLS_PLATFORM_C */
+ return( ret );
+}
+
+void platform_teardown( void )
+{
+#if defined(MBEDTLS_PLATFORM_C)
+ mbedtls_platform_teardown( &platform_ctx );
+#endif /* MBEDTLS_PLATFORM_C */
+}
+
+int unhexify( unsigned char *obuf, const char *ibuf )
+{
+ unsigned char c, c2;
+ int len = strlen( ibuf ) / 2;
+ TEST_HELPER_ASSERT( strlen( ibuf ) % 2 == 0 ); /* must be even number of bytes */
+
+ while( *ibuf != 0 )
+ {
+ c = *ibuf++;
+ if( c >= '0' && c <= '9' )
+ c -= '0';
+ else if( c >= 'a' && c <= 'f' )
+ c -= 'a' - 10;
+ else if( c >= 'A' && c <= 'F' )
+ c -= 'A' - 10;
+ else
+ TEST_HELPER_ASSERT( 0 );
+
+ c2 = *ibuf++;
+ if( c2 >= '0' && c2 <= '9' )
+ c2 -= '0';
+ else if( c2 >= 'a' && c2 <= 'f' )
+ c2 -= 'a' - 10;
+ else if( c2 >= 'A' && c2 <= 'F' )
+ c2 -= 'A' - 10;
+ else
+ TEST_HELPER_ASSERT( 0 );
+
+ *obuf++ = ( c << 4 ) | c2;
+ }
+
+ return len;
+}
+
+void hexify( unsigned char *obuf, const unsigned char *ibuf, int len )
+{
+ unsigned char l, h;
+
+ while( len != 0 )
+ {
+ h = *ibuf / 16;
+ l = *ibuf % 16;
+
+ if( h < 10 )
+ *obuf++ = '0' + h;
+ else
+ *obuf++ = 'a' + h - 10;
+
+ if( l < 10 )
+ *obuf++ = '0' + l;
+ else
+ *obuf++ = 'a' + l - 10;
+
+ ++ibuf;
+ len--;
+ }
+}
+
+unsigned char *zero_alloc( size_t len )
+{
+ void *p;
+ size_t actual_len = ( len != 0 ) ? len : 1;
+
+ p = mbedtls_calloc( 1, actual_len );
+ TEST_HELPER_ASSERT( p != NULL );
+
+ memset( p, 0x00, actual_len );
+
+ return( p );
+}
+
+unsigned char *unhexify_alloc( const char *ibuf, size_t *olen )
+{
+ unsigned char *obuf;
+
+ *olen = strlen( ibuf ) / 2;
+
+ if( *olen == 0 )
+ return( zero_alloc( *olen ) );
+
+ obuf = mbedtls_calloc( 1, *olen );
+ TEST_HELPER_ASSERT( obuf != NULL );
+
+ (void) unhexify( obuf, ibuf );
+
+ return( obuf );
+}
+
+int hexcmp( uint8_t * a, uint8_t * b, uint32_t a_len, uint32_t b_len )
+{
+ int ret = 0;
+ uint32_t i = 0;
+
+ if( a_len != b_len )
+ return( -1 );
+
+ for( i = 0; i < a_len; i++ )
+ {
+ if( a[i] != b[i] )
+ {
+ ret = -1;
+ break;
+ }
+ }
+ return ret;
+}
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index 445c5c9..2d1e38c 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -368,10 +368,6 @@
test_info_t;
static test_info_t test_info;
-#if defined(MBEDTLS_PLATFORM_C)
-static mbedtls_platform_context platform_ctx;
-#endif
-
#if defined(MBEDTLS_CHECK_PARAMS)
jmp_buf param_fail_jmp;
jmp_buf jmp_tmp;
@@ -424,22 +420,6 @@
test_info.filename = filename;
}
-int platform_setup()
-{
- int ret = 0;
-#if defined(MBEDTLS_PLATFORM_C)
- ret = mbedtls_platform_setup( &platform_ctx );
-#endif /* MBEDTLS_PLATFORM_C */
- return( ret );
-}
-
-void platform_teardown()
-{
-#if defined(MBEDTLS_PLATFORM_C)
- mbedtls_platform_teardown( &platform_ctx );
-#endif /* MBEDTLS_PLATFORM_C */
-}
-
#if defined(MBEDTLS_CHECK_PARAMS)
void mbedtls_param_failed( const char *failure_condition,
const char *file,
@@ -507,111 +487,6 @@
}
#endif /* __unix__ || __APPLE__ __MACH__ */
-int unhexify( unsigned char *obuf, const char *ibuf )
-{
- unsigned char c, c2;
- int len = strlen( ibuf ) / 2;
- TEST_HELPER_ASSERT( strlen( ibuf ) % 2 == 0 ); /* must be even number of bytes */
-
- while( *ibuf != 0 )
- {
- c = *ibuf++;
- if( c >= '0' && c <= '9' )
- c -= '0';
- else if( c >= 'a' && c <= 'f' )
- c -= 'a' - 10;
- else if( c >= 'A' && c <= 'F' )
- c -= 'A' - 10;
- else
- TEST_HELPER_ASSERT( 0 );
-
- c2 = *ibuf++;
- if( c2 >= '0' && c2 <= '9' )
- c2 -= '0';
- else if( c2 >= 'a' && c2 <= 'f' )
- c2 -= 'a' - 10;
- else if( c2 >= 'A' && c2 <= 'F' )
- c2 -= 'A' - 10;
- else
- TEST_HELPER_ASSERT( 0 );
-
- *obuf++ = ( c << 4 ) | c2;
- }
-
- return len;
-}
-
-void hexify( unsigned char *obuf, const unsigned char *ibuf, int len )
-{
- unsigned char l, h;
-
- while( len != 0 )
- {
- h = *ibuf / 16;
- l = *ibuf % 16;
-
- if( h < 10 )
- *obuf++ = '0' + h;
- else
- *obuf++ = 'a' + h - 10;
-
- if( l < 10 )
- *obuf++ = '0' + l;
- else
- *obuf++ = 'a' + l - 10;
-
- ++ibuf;
- len--;
- }
-}
-
-/**
- * Allocate and zeroize a buffer.
- *
- * If the size if zero, a pointer to a zeroized 1-byte buffer is returned.
- *
- * For convenience, dies if allocation fails.
- */
-unsigned char *zero_alloc( size_t len )
-{
- void *p;
- size_t actual_len = ( len != 0 ) ? len : 1;
-
- p = mbedtls_calloc( 1, actual_len );
- TEST_HELPER_ASSERT( p != NULL );
-
- memset( p, 0x00, actual_len );
-
- return( p );
-}
-
-/**
- * Allocate and fill a buffer from hex data.
- *
- * The buffer is sized exactly as needed. This allows to detect buffer
- * overruns (including overreads) when running the test suite under valgrind.
- *
- * If the size if zero, a pointer to a zeroized 1-byte buffer is returned.
- *
- * For convenience, dies if allocation fails.
- */
-unsigned char *unhexify_alloc( const char *ibuf, size_t *olen )
-{
- unsigned char *obuf;
-
- *olen = strlen( ibuf ) / 2;
-
- if( *olen == 0 )
- return( zero_alloc( *olen ) );
-
- obuf = mbedtls_calloc( 1, *olen );
- TEST_HELPER_ASSERT( obuf != NULL );
-
- (void) unhexify( obuf, ibuf );
-
- return( obuf );
-}
-
/**
* This function just returns data from rand().
* Although predictable and often similar on multiple
@@ -752,22 +627,3 @@
return( 0 );
}
-
-int hexcmp( uint8_t * a, uint8_t * b, uint32_t a_len, uint32_t b_len )
-{
- int ret = 0;
- uint32_t i = 0;
-
- if( a_len != b_len )
- return( -1 );
-
- for( i = 0; i < a_len; i++ )
- {
- if( a[i] != b[i] )
- {
- ret = -1;
- break;
- }
- }
- return ret;
-}