yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 21:45:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

ssl test suite: enable dropping bytes from buffer

Browse Source 
Add an option to not pass any buffer to mbedtls_test_buffer_get to drop data.
This commit is contained in:
Andrzej Kurek 2020-01-22 06:34:59 -05:00
parent 252faff19f
commit f7774146b6
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/suites/test_suite_ssl.function
View File

@ -95,16 +95,16 @@ int mbedtls_test_buffer_put( mbedtls_test_buffer *buf,
} }
/* /*
* Gets \p output_len bytes from the \p output buffer into the ring buffer * Gets \p output_len bytes from the ring buffer \p buf into the
* \p buf. * \p output buffer. The output buffer can be NULL, in this case a part of the
* ring buffer will be dropped, if the requested length is available.
* *
* \p buf must have been initialized and set up by calling * \p buf must have been initialized and set up by calling
* `mbedtls_test_buffer_init()` and `mbedtls_test_buffer_setup()`. * `mbedtls_test_buffer_init()` and `mbedtls_test_buffer_setup()`.
* *
* \retval \p output_len, if the data is available. * \retval \p output_len, if the data is available.
* \retval 0 <= value < \p output_len, if the data is not available. * \retval 0 <= value < \p output_len, if the data is not available.
* \retval -1, if \buf is NULL, it hasn't been set up or \p output_len is not * \retval -1, if \buf is NULL or it hasn't been set up.
* zero and \p output is NULL
*/ */
int mbedtls_test_buffer_get( mbedtls_test_buffer *buf, int mbedtls_test_buffer_get( mbedtls_test_buffer *buf,
unsigned char* output, size_t output_len ) unsigned char* output, size_t output_len )
@ -114,10 +114,8 @@ int mbedtls_test_buffer_get( mbedtls_test_buffer *buf,
if( ( buf == NULL ) || ( buf->buffer == NULL ) ) if( ( buf == NULL ) || ( buf->buffer == NULL ) )
return -1; return -1;
if( output == NULL ) if( output == NULL && output_len == 0 )
{ return 0;
return ( output_len == 0 ) ? 0 : -1;
}
if( buf->content_length < output_len ) if( buf->content_length < output_len )
output_len = buf->content_length; output_len = buf->content_length;
@ -129,8 +127,12 @@ int mbedtls_test_buffer_get( mbedtls_test_buffer *buf,
overflow = ( buf->start + output_len ) % buf->capacity; overflow = ( buf->start + output_len ) % buf->capacity;
} }
if( output != NULL )
{
memcpy( output, buf->buffer + buf->start, output_len - overflow ); memcpy( output, buf->buffer + buf->start, output_len - overflow );
memcpy( output + output_len - overflow, buf->buffer, overflow ); memcpy( output + output_len - overflow, buf->buffer, overflow );
}
buf->content_length -= output_len; buf->content_length -= output_len;
buf->start = ( buf->start + output_len ) % buf->capacity; buf->start = ( buf->start + output_len ) % buf->capacity;
@ -714,8 +716,7 @@ void test_callback_buffer_sanity()
TEST_ASSERT( mbedtls_test_buffer_get( NULL, output, sizeof( output ) ) TEST_ASSERT( mbedtls_test_buffer_get( NULL, output, sizeof( output ) )
== -1 ); == -1 );
TEST_ASSERT( mbedtls_test_buffer_put( NULL, NULL, sizeof( input ) ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_put( NULL, NULL, sizeof( input ) ) == -1 );
TEST_ASSERT( mbedtls_test_buffer_get( NULL, NULL, sizeof( output ) )
== -1 );
TEST_ASSERT( mbedtls_test_buffer_put( NULL, NULL, 0 ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_put( NULL, NULL, 0 ) == -1 );
TEST_ASSERT( mbedtls_test_buffer_get( NULL, NULL, 0 ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_get( NULL, NULL, 0 ) == -1 );
@ -727,19 +728,20 @@ void test_callback_buffer_sanity()
TEST_ASSERT( mbedtls_test_buffer_get( &buf, output, sizeof( output ) ) TEST_ASSERT( mbedtls_test_buffer_get( &buf, output, sizeof( output ) )
== -1 ); == -1 );
TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, sizeof( input ) ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, sizeof( input ) ) == -1 );
TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, sizeof( output ) )
== -1 );
TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, 0 ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, 0 ) == -1 );
TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, 0 ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, 0 ) == -1 );
/* Make sure calling put end get on NULL input and output only results in /* Make sure calling put and get on NULL input only results in
* error if the length is not zero. */ * error if the length is not zero, and that a NULL output is valid for data
* dropping.
*/
TEST_ASSERT( mbedtls_test_buffer_setup( &buf, sizeof( input ) ) == 0 ); TEST_ASSERT( mbedtls_test_buffer_setup( &buf, sizeof( input ) ) == 0 );
TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, sizeof( input ) ) == -1 ); TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, sizeof( input ) ) == -1 );
TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, sizeof( output ) ) TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, sizeof( output ) )
== -1 ); == 0 );
TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, 0 ) == 0 ); TEST_ASSERT( mbedtls_test_buffer_put( &buf, NULL, 0 ) == 0 );
TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, 0 ) == 0 ); TEST_ASSERT( mbedtls_test_buffer_get( &buf, NULL, 0 ) == 0 );