eden-emu/mbedtls
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add tests for ChaChaPoly parameter validation

Browse source 
Parameter validation was previously performed and tested unconditionally
for the ChaCha/Poly modules. This commit therefore only needs go guard the
existing tests accordingly and use the appropriate test macros for parameter
validation.
This commit is contained in:
Hanno Becker 2018-12-11 15:14:02 +00:00
parent 305e4e4f32
commit ae2ff02ff1
3 changed files with 123 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

57
tests/suites/test_suite_chacha20.function
View file

@ -82,7 +82,7 @@ void chacha20_crypt( char *hex_key_string,
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_CHECK_PARAMS:!MBEDTLS_PARAM_FAILED_ALT */
void chacha20_bad_params() void chacha20_bad_params()
{ {
unsigned char key[32]; unsigned char key[32];
@ -93,42 +93,37 @@ void chacha20_bad_params()
size_t len = sizeof( src ); size_t len = sizeof( src );
mbedtls_chacha20_context ctx; mbedtls_chacha20_context ctx;
mbedtls_chacha20_init( NULL ); TEST_INVALID_PARAM( mbedtls_chacha20_init( NULL ) );
mbedtls_chacha20_free( NULL );
mbedtls_chacha20_init( &ctx ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
mbedtls_chacha20_setkey( NULL, key ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
mbedtls_chacha20_setkey( &ctx, NULL ) );
TEST_ASSERT( mbedtls_chacha20_setkey( NULL, key ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_starts( NULL, nonce, counter ) );
TEST_ASSERT( mbedtls_chacha20_setkey( &ctx, NULL ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_starts( &ctx, NULL, counter ) );
TEST_ASSERT( mbedtls_chacha20_starts( NULL, nonce, counter ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_update( NULL, 0, src, dst ) );
TEST_ASSERT( mbedtls_chacha20_starts( &ctx, NULL, counter ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_update( &ctx, len, NULL, dst ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
mbedtls_chacha20_update( &ctx, len, src, NULL ) );
TEST_ASSERT( mbedtls_chacha20_update( NULL, 0, src, dst ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_crypt( NULL, nonce, counter, 0, src, dst ) );
TEST_ASSERT( mbedtls_chacha20_update( &ctx, len, NULL, dst ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_crypt( key, NULL, counter, 0, src, dst ) );
TEST_ASSERT( mbedtls_chacha20_update( &ctx, len, src, NULL ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA ); mbedtls_chacha20_crypt( key, nonce, counter, len, NULL, dst ) );
TEST_ASSERT( mbedtls_chacha20_update( &ctx, 0, NULL, NULL ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA,
== 0 ); mbedtls_chacha20_crypt( key, nonce, counter, len, src, NULL ) );
mbedtls_chacha20_free( &ctx ); exit:
return;
TEST_ASSERT( mbedtls_chacha20_crypt( NULL, nonce, counter, 0, src, dst )
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chacha20_crypt( key, NULL, counter, 0, src, dst )
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chacha20_crypt( key, nonce, counter, len, NULL, dst )
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chacha20_crypt( key, nonce, counter, len, src, NULL )
== MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chacha20_crypt( key, nonce, counter, 0, NULL, NULL )
== 0 );
} }
/* END_CASE */ /* END_CASE */

161
tests/suites/test_suite_chachapoly.function
View file

@ -118,7 +118,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_CHECK_PARAMS:!MBEDTLS_PARAM_FAILED_ALT */
void chachapoly_bad_params() void chachapoly_bad_params()
{ {
unsigned char key[32]; unsigned char key[32];
@ -138,124 +138,113 @@ void chachapoly_bad_params()
memset( output, 0x00, sizeof( output ) ); memset( output, 0x00, sizeof( output ) );
memset( mac, 0x00, sizeof( mac ) ); memset( mac, 0x00, sizeof( mac ) );
mbedtls_chachapoly_init( NULL ); TEST_INVALID_PARAM( mbedtls_chachapoly_init( NULL ) );
mbedtls_chachapoly_free( NULL );
mbedtls_chachapoly_init( &ctx ); /* setkey */
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_setkey( NULL, key ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_setkey( &ctx, NULL ) );
TEST_ASSERT( mbedtls_chachapoly_setkey( NULL, key ) /* encrypt_and_tag */
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_setkey( &ctx, NULL ) mbedtls_chachapoly_encrypt_and_tag( NULL,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( NULL,
0, nonce, 0, nonce,
aad, 0, aad, 0,
input, output, mac ) input, output, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, mbedtls_chachapoly_encrypt_and_tag( &ctx,
0, NULL, 0, NULL,
aad, 0, aad, 0,
input, output, mac ) input, output, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, mbedtls_chachapoly_encrypt_and_tag( &ctx,
0, nonce, 0, nonce,
NULL, aad_len, NULL, aad_len,
input, output, mac ) input, output, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, mbedtls_chachapoly_encrypt_and_tag( &ctx,
input_len, nonce, input_len, nonce,
aad, 0, aad, 0,
NULL, output, mac ) NULL, output, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, mbedtls_chachapoly_encrypt_and_tag( &ctx,
input_len, nonce, input_len, nonce,
aad, 0, aad, 0,
input, NULL, mac ) input, NULL, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, mbedtls_chachapoly_encrypt_and_tag( &ctx,
0, nonce, 0, nonce,
aad, 0, aad, 0,
input, output, NULL ) input, output, NULL ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( NULL, /* auth_decrypt */
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_auth_decrypt( NULL,
0, nonce, 0, nonce,
aad, 0, aad, 0,
mac, input, output ) mac, input, output ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_auth_decrypt( &ctx,
0, NULL, 0, NULL,
aad, 0, aad, 0,
mac, input, output ) mac, input, output ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_auth_decrypt( &ctx,
0, nonce, 0, nonce,
NULL, aad_len, NULL, aad_len,
mac, input, output ) mac, input, output ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_auth_decrypt( &ctx,
0, nonce, 0, nonce,
aad, 0, aad, 0,
NULL, input, output ) NULL, input, output ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_auth_decrypt( &ctx,
input_len, nonce, input_len, nonce,
aad, 0, aad, 0,
mac, NULL, output ) mac, NULL, output ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_auth_decrypt( &ctx,
input_len, nonce, input_len, nonce,
aad, 0, aad, 0,
mac, input, NULL ) mac, input, NULL ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, /* starts */
0, nonce, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
aad, aad_len, mbedtls_chachapoly_starts( NULL, nonce,
NULL, NULL, mac ) MBEDTLS_CHACHAPOLY_ENCRYPT ) );
== 0 ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_starts( &ctx, NULL,
0, nonce, MBEDTLS_CHACHAPOLY_ENCRYPT ) );
aad, aad_len,
mac, NULL, NULL )
== 0 );
TEST_ASSERT( mbedtls_chachapoly_encrypt_and_tag( &ctx, /* update_aad */
input_len, nonce, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
NULL, 0, mbedtls_chachapoly_update_aad( NULL, aad,
input, output, mac ) aad_len ) );
== 0 ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_auth_decrypt( &ctx, mbedtls_chachapoly_update_aad( &ctx, NULL,
input_len, nonce, aad_len ) );
NULL, 0,
mac, input, output )
== 0 );
TEST_ASSERT( mbedtls_chachapoly_starts( NULL, nonce, MBEDTLS_CHACHAPOLY_ENCRYPT ) /* update */
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_starts( &ctx, NULL, MBEDTLS_CHACHAPOLY_ENCRYPT ) mbedtls_chachapoly_update( NULL, input_len,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); input, output ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_update( &ctx, input_len,
NULL, output ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_update( &ctx, input_len,
input, NULL ) );
TEST_ASSERT( mbedtls_chachapoly_update_aad( NULL, aad, aad_len ) /* finish */
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
TEST_ASSERT( mbedtls_chachapoly_update_aad( &ctx, NULL, aad_len ) mbedtls_chachapoly_finish( NULL, mac ) );
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_chachapoly_finish( &ctx, NULL ) );
TEST_ASSERT( mbedtls_chachapoly_update( NULL, input_len, input, output )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_update( &ctx, input_len, NULL, output )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_update( &ctx, input_len, input, NULL )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_finish( NULL, mac )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_chachapoly_finish( &ctx, NULL )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
exit: exit:
mbedtls_chachapoly_free( &ctx ); return;
} }
/* END_CASE */ /* END_CASE */

50
tests/suites/test_suite_poly1305.function
View file

@ -88,7 +88,7 @@ void mbedtls_poly1305( char *hex_key_string, char *hex_mac_string, char *hex_src
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_CHECK_PARAMS:!MBEDTLS_PARAM_FAILED_ALT */
void poly1305_bad_params() void poly1305_bad_params()
{ {
unsigned char src[1]; unsigned char src[1];
@ -97,38 +97,32 @@ void poly1305_bad_params()
size_t src_len = sizeof( src ); size_t src_len = sizeof( src );
mbedtls_poly1305_context ctx; mbedtls_poly1305_context ctx;
mbedtls_poly1305_init( NULL ); TEST_INVALID_PARAM( mbedtls_poly1305_init( NULL ) );
mbedtls_poly1305_free( NULL );
mbedtls_poly1305_init( &ctx ); TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_poly1305_starts( NULL, key ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_poly1305_starts( &ctx, NULL ) );
TEST_ASSERT( mbedtls_poly1305_starts( NULL, key ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_update( NULL, src, 0 ) );
TEST_ASSERT( mbedtls_poly1305_starts( &ctx, NULL ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_update( &ctx, NULL, src_len ) );
TEST_ASSERT( mbedtls_poly1305_update( NULL, src, 0 ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_finish( NULL, mac ) );
TEST_ASSERT( mbedtls_poly1305_update( &ctx, NULL, src_len ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_finish( &ctx, NULL ) );
TEST_ASSERT( mbedtls_poly1305_update( &ctx, NULL, 0 )
== 0 );
TEST_ASSERT( mbedtls_poly1305_finish( NULL, mac ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_mac( NULL, src, 0, mac ) );
TEST_ASSERT( mbedtls_poly1305_finish( &ctx, NULL ) TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); mbedtls_poly1305_mac( key, NULL, src_len, mac ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA,
mbedtls_poly1305_mac( key, src, 0, NULL ) );
TEST_ASSERT( mbedtls_poly1305_mac( NULL, src, 0, mac ) exit:
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA ); return;
TEST_ASSERT( mbedtls_poly1305_mac( key, NULL, src_len, mac )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_poly1305_mac( key, src, 0, NULL )
== MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA );
TEST_ASSERT( mbedtls_poly1305_mac( key, NULL, 0, mac )
== 0 );
mbedtls_poly1305_free( &ctx );
} }
/* END_CASE */ /* END_CASE */