AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update old style test function parameter handling

Browse Source 
Use data_t type for hex string parameters.

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2022-03-16 16:53:23 +01:00
parent 4fded1359a
commit 88f3b2e502
No known key found for this signature in database
GPG Key ID: 106F5A41ECC305BD
2 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/suites/test_suite_hkdf.function
View File

@ -30,15 +30,14 @@ void test_hkdf( int md_alg, data_t *ikm, data_t *salt, data_t *info,
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void test_hkdf_extract( int md_alg, char *hex_ikm_string, void test_hkdf_extract( int md_alg,
char *hex_salt_string, char *hex_prk_string ) data_t *ikm,
data_t *salt,
data_t *prk )
{ {
int ret; int ret;
unsigned char *ikm = NULL;
unsigned char *salt = NULL;
unsigned char *prk = NULL;
unsigned char *output_prk = NULL; unsigned char *output_prk = NULL;
size_t ikm_len, salt_len, prk_len, output_prk_len; size_t output_prk_len;
const mbedtls_md_info_t *md = mbedtls_md_info_from_type( md_alg ); const mbedtls_md_info_t *md = mbedtls_md_info_from_type( md_alg );
TEST_ASSERT( md != NULL ); TEST_ASSERT( md != NULL );
@ -46,55 +45,42 @@ void test_hkdf_extract( int md_alg, char *hex_ikm_string,
output_prk_len = mbedtls_md_get_size( md ); output_prk_len = mbedtls_md_get_size( md );
ASSERT_ALLOC( output_prk, output_prk_len ); ASSERT_ALLOC( output_prk, output_prk_len );
ikm = mbedtls_test_unhexify_alloc( hex_ikm_string, &ikm_len ); ret = mbedtls_hkdf_extract( md, salt->x, salt->len,
salt = mbedtls_test_unhexify_alloc( hex_salt_string, &salt_len ); ikm->x, ikm->len, output_prk );
prk = mbedtls_test_unhexify_alloc( hex_prk_string, &prk_len );
ret = mbedtls_hkdf_extract( md, salt, salt_len, ikm, ikm_len, output_prk );
TEST_ASSERT( ret == 0 ); TEST_ASSERT( ret == 0 );
ASSERT_COMPARE( output_prk, output_prk_len, prk, prk_len ); ASSERT_COMPARE( output_prk, output_prk_len, prk->x, prk->len );
exit: exit:
mbedtls_free(ikm);
mbedtls_free(salt);
mbedtls_free(prk);
mbedtls_free(output_prk); mbedtls_free(output_prk);
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void test_hkdf_expand( int md_alg, char *hex_info_string, void test_hkdf_expand( int md_alg,
char *hex_prk_string, char *hex_okm_string ) data_t *info,
data_t *prk,
data_t *okm )
{ {
enum { OKM_LEN = 1024 }; enum { OKM_LEN = 1024 };
int ret; int ret;
unsigned char *info = NULL;
unsigned char *prk = NULL;
unsigned char *okm = NULL;
unsigned char *output_okm = NULL; unsigned char *output_okm = NULL;
size_t info_len, prk_len, okm_len;
const mbedtls_md_info_t *md = mbedtls_md_info_from_type( md_alg ); const mbedtls_md_info_t *md = mbedtls_md_info_from_type( md_alg );
TEST_ASSERT( md != NULL ); TEST_ASSERT( md != NULL );
ASSERT_ALLOC( output_okm, OKM_LEN ); ASSERT_ALLOC( output_okm, OKM_LEN );
prk = mbedtls_test_unhexify_alloc( hex_prk_string, &prk_len ); TEST_ASSERT( prk->len == mbedtls_md_get_size( md ) );
info = mbedtls_test_unhexify_alloc( hex_info_string, &info_len ); TEST_ASSERT( okm->len < OKM_LEN );
okm = mbedtls_test_unhexify_alloc( hex_okm_string, &okm_len );
TEST_ASSERT( prk_len == mbedtls_md_get_size( md ) );
TEST_ASSERT( okm_len < OKM_LEN );
ret = mbedtls_hkdf_expand( md, prk, prk_len, info, info_len, ret = mbedtls_hkdf_expand( md, prk->x, prk->len,
info->x, info->len,
output_okm, OKM_LEN ); output_okm, OKM_LEN );
TEST_ASSERT( ret == 0 ); TEST_ASSERT( ret == 0 );
ASSERT_COMPARE( output_okm, okm_len, okm, okm_len ); ASSERT_COMPARE( output_okm, okm->len, okm->x, okm->len );
exit: exit:
mbedtls_free(info);
mbedtls_free(prk);
mbedtls_free(okm);
mbedtls_free(output_okm); mbedtls_free(output_okm);
} }
/* END_CASE */ /* END_CASE */

50
tests/suites/test_suite_ssl.function
View File

@ -3807,35 +3807,27 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_extract( int alg, char *hex_ikm_string, void psa_hkdf_extract( int alg,
char *hex_salt_string, char *hex_prk_string ) data_t *ikm,
data_t *salt,
data_t *prk )
{ {
unsigned char *ikm = NULL;
unsigned char *salt = NULL;
unsigned char *prk = NULL;
unsigned char *output_prk = NULL; unsigned char *output_prk = NULL;
size_t ikm_len, salt_len, prk_len, output_prk_size, output_prk_len; size_t output_prk_size, output_prk_len;
PSA_INIT( ); PSA_INIT( );
output_prk_size = PSA_HASH_LENGTH( alg ); output_prk_size = PSA_HASH_LENGTH( alg );
ASSERT_ALLOC( output_prk, output_prk_size ); ASSERT_ALLOC( output_prk, output_prk_size );
ikm = mbedtls_test_unhexify_alloc( hex_ikm_string, &ikm_len ); PSA_ASSERT( mbedtls_psa_hkdf_extract( alg, salt->x, salt->len,
salt = mbedtls_test_unhexify_alloc( hex_salt_string, &salt_len ); ikm->x, ikm->len,
prk = mbedtls_test_unhexify_alloc( hex_prk_string, &prk_len );
PSA_ASSERT( mbedtls_psa_hkdf_extract( alg, salt, salt_len,
ikm, ikm_len,
output_prk, output_prk_size, output_prk, output_prk_size,
&output_prk_len ) ); &output_prk_len ) );
ASSERT_COMPARE( output_prk, output_prk_len, prk, prk_len ); ASSERT_COMPARE( output_prk, output_prk_len, prk->x, prk->len );
exit: exit:
mbedtls_free( ikm );
mbedtls_free( salt );
mbedtls_free( prk );
mbedtls_free( output_prk ); mbedtls_free( output_prk );
PSA_DONE( ); PSA_DONE( );
@ -3872,35 +3864,27 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_expand( int alg, char *hex_info_string, void psa_hkdf_expand( int alg,
char *hex_prk_string, char *hex_okm_string ) data_t *info,
data_t *prk,
data_t *okm )
{ {
enum { OKM_LEN = 1024 }; enum { OKM_LEN = 1024 };
unsigned char *info = NULL;
unsigned char *prk = NULL;
unsigned char *okm = NULL;
unsigned char *output_okm = NULL; unsigned char *output_okm = NULL;
size_t info_len, prk_len, okm_len;
PSA_INIT( ); PSA_INIT( );
ASSERT_ALLOC( output_okm, OKM_LEN ); ASSERT_ALLOC( output_okm, OKM_LEN );
TEST_ASSERT( prk->len == PSA_HASH_LENGTH( alg ) );
TEST_ASSERT( okm->len < OKM_LEN );
prk = mbedtls_test_unhexify_alloc( hex_prk_string, &prk_len ); PSA_ASSERT( mbedtls_psa_hkdf_expand( alg, prk->x, prk->len,
info = mbedtls_test_unhexify_alloc( hex_info_string, &info_len ); info->x, info->len,
okm = mbedtls_test_unhexify_alloc( hex_okm_string, &okm_len );
TEST_ASSERT( prk_len == PSA_HASH_LENGTH( alg ) );
TEST_ASSERT( okm_len < OKM_LEN );
PSA_ASSERT( mbedtls_psa_hkdf_expand( alg, prk, prk_len, info, info_len,
output_okm, OKM_LEN ) ); output_okm, OKM_LEN ) );
ASSERT_COMPARE( output_okm, okm_len, okm, okm_len ); ASSERT_COMPARE( output_okm, okm->len, okm->x, okm->len );
exit: exit:
mbedtls_free( info );
mbedtls_free( prk );
mbedtls_free( okm );
mbedtls_free( output_okm ); mbedtls_free( output_okm );
PSA_DONE( ); PSA_DONE( );