diff options
| author | Azim Khan <Azim.Khan@arm.com> | 2017-06-09 04:32:58 +0100 |
|---|---|---|
| committer | Mohammad Azim Khan <Azim.Khan@arm.com> | 2018-08-06 11:40:57 +0100 |
| commit | d30ca130e8a597b8dfeda7ccfab9a54bd2db4967 (patch) | |
| tree | f0c67d5d30d24c1408162e707c4cd7bdea654b7a /tests/suites/test_suite_asn1write.function | |
| parent | 5cfc06832e92849d65753b800942153bdee14dda (diff) | |
| download | mbedtls-d30ca130e8a597b8dfeda7ccfab9a54bd2db4967.zip mbedtls-d30ca130e8a597b8dfeda7ccfab9a54bd2db4967.tar.gz mbedtls-d30ca130e8a597b8dfeda7ccfab9a54bd2db4967.tar.bz2 | |
Combine hex parameters in a struct
Diffstat (limited to 'tests/suites/test_suite_asn1write.function')
| -rw-r--r-- | tests/suites/test_suite_asn1write.function | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/suites/test_suite_asn1write.function b/tests/suites/test_suite_asn1write.function index 3befa44..3b2d86e 100644 --- a/tests/suites/test_suite_asn1write.function +++ b/tests/suites/test_suite_asn1write.function @@ -11,8 +11,7 @@ */ /* BEGIN_CASE */ -void mbedtls_asn1_write_octet_string( uint8_t * str, uint32_t str_len, - uint8_t * asn1, uint32_t asn1_len, +void mbedtls_asn1_write_octet_string( HexParam_t * str, HexParam_t * asn1, int buf_len, int result ) { int ret; @@ -25,7 +24,7 @@ void mbedtls_asn1_write_octet_string( uint8_t * str, uint32_t str_len, p = buf + GUARD_LEN + buf_len; - ret = mbedtls_asn1_write_octet_string( &p, buf + GUARD_LEN, str, str_len ); + ret = mbedtls_asn1_write_octet_string( &p, buf + GUARD_LEN, str->x, str->len ); /* Check for buffer overwrite on both sides */ for( i = 0; i < GUARD_LEN; i++ ) @@ -36,17 +35,17 @@ void mbedtls_asn1_write_octet_string( uint8_t * str, uint32_t str_len, if( result >= 0 ) { - TEST_ASSERT( p + asn1_len == buf + GUARD_LEN + buf_len ); + TEST_ASSERT( (size_t) ret == asn1->len ); + TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len ); - TEST_ASSERT( memcmp( p, asn1, asn1_len ) == 0 ); + TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 ); } } /* END_CASE */ /* BEGIN_CASE */ -void mbedtls_asn1_write_ia5_string( char * str, uint8_t * asn1, - uint32_t asn1_len, int buf_len, int result - ) +void mbedtls_asn1_write_ia5_string( char * str, HexParam_t * asn1, + int buf_len, int result ) { int ret; unsigned char buf[150]; @@ -71,16 +70,17 @@ void mbedtls_asn1_write_ia5_string( char * str, uint8_t * asn1, if( result >= 0 ) { - TEST_ASSERT( p + asn1_len == buf + GUARD_LEN + buf_len ); + TEST_ASSERT( (size_t) ret == asn1->len ); + TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len ); - TEST_ASSERT( memcmp( p, asn1, asn1_len ) == 0 ); + TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 ); } } /* END_CASE */ /* BEGIN_CASE */ -void mbedtls_asn1_write_len( int len, uint8_t * asn1, uint32_t asn1_len, - int buf_len, int result ) +void mbedtls_asn1_write_len( int len, HexParam_t * asn1, int buf_len, + int result ) { int ret; unsigned char buf[150]; @@ -105,9 +105,9 @@ void mbedtls_asn1_write_len( int len, uint8_t * asn1, uint32_t asn1_len, if( result >= 0 ) { - TEST_ASSERT( p + asn1_len == buf + GUARD_LEN + buf_len ); + TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len ); - TEST_ASSERT( memcmp( p, asn1, asn1_len ) == 0 ); + TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 ); /* Read back with mbedtls_asn1_get_len() to check */ ret = mbedtls_asn1_get_len( &p, buf + GUARD_LEN + buf_len, &read_len ); |