Avoid in-out length in base64

This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-02 16:30:35 +01:00
parent 3335205a21
commit ba56136b5c
6 changed files with 41 additions and 45 deletions

View file

@ -13,13 +13,13 @@ void mbedtls_base64_encode( char *src_string, char *dst_string, int dst_buf_size
{
unsigned char src_str[1000];
unsigned char dst_str[1000];
size_t len = dst_buf_size;
size_t len;
memset(src_str, 0x00, 1000);
memset(dst_str, 0x00, 1000);
strncpy( (char *) src_str, src_string, sizeof(src_str) - 1 );
TEST_ASSERT( mbedtls_base64_encode( dst_str, &len, src_str, strlen( (char *) src_str ) ) == result );
TEST_ASSERT( mbedtls_base64_encode( dst_str, dst_buf_size, &len, src_str, strlen( (char *) src_str ) ) == result );
if( result == 0 )
{
TEST_ASSERT( strcmp( (char *) dst_str, dst_string ) == 0 );
@ -32,14 +32,14 @@ void mbedtls_base64_decode( char *src_string, char *dst_string, int result )
{
unsigned char src_str[1000];
unsigned char dst_str[1000];
size_t len = 1000;
size_t len;
int res;
memset(src_str, 0x00, 1000);
memset(dst_str, 0x00, 1000);
strncpy( (char *) src_str, src_string, sizeof(src_str) - 1 );
res = mbedtls_base64_decode( dst_str, &len, src_str, strlen( (char *) src_str ) );
res = mbedtls_base64_decode( dst_str, sizeof( dst_str ), &len, src_str, strlen( (char *) src_str ) );
TEST_ASSERT( res == result );
if( result == 0 )
{
@ -53,12 +53,12 @@ void base64_encode_hex( char *src_hex, char *dst, int dst_buf_size,
int result )
{
unsigned char *src = NULL, *res = NULL;
size_t len = dst_buf_size, src_len;
size_t len, src_len;
src = unhexify_alloc( src_hex, &src_len );
res = zero_alloc( dst_buf_size );
TEST_ASSERT( mbedtls_base64_encode( res, &len, src, src_len ) == result );
TEST_ASSERT( mbedtls_base64_encode( res, dst_buf_size, &len, src, src_len ) == result );
if( result == 0 )
{
TEST_ASSERT( len == strlen( dst ) );
@ -76,12 +76,12 @@ void base64_decode_hex( char *src, char *dst_hex, int dst_buf_size,
int result )
{
unsigned char *dst = NULL, *res = NULL;
size_t len = dst_buf_size, dst_len;
size_t len, dst_len;
dst = unhexify_alloc( dst_hex, &dst_len );
res = zero_alloc( dst_buf_size );
TEST_ASSERT( mbedtls_base64_decode( res, &len, (unsigned char *) src,
TEST_ASSERT( mbedtls_base64_decode( res, dst_buf_size, &len, (unsigned char *) src,
strlen( src ) ) == result );
if( result == 0 )
{
@ -104,8 +104,7 @@ void base64_decode_hex_src( char *src_hex, char *dst_ref, int result )
src = unhexify_alloc( src_hex, &src_len );
len = sizeof( dst );
TEST_ASSERT( mbedtls_base64_decode( dst, &len, src, src_len ) == result );
TEST_ASSERT( mbedtls_base64_decode( dst, sizeof( dst ), &len, src, src_len ) == result );
if( result == 0 )
{
TEST_ASSERT( len == strlen( dst_ref ) );