tests: Reformating due to rnd_* renaming
Command to find the files in which lines have gone
larger than 79 characters due to the renaming:
grep '.\{80\}' \
`git diff-tree --no-commit-id --name-only -r HEAD` \
| grep "\<mbedtls_test_rnd_"
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function
index afee710..76f72e2 100644
--- a/tests/suites/test_suite_ecdsa.function
+++ b/tests/suites/test_suite_ecdsa.function
@@ -31,23 +31,28 @@
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( NULL, &m, &m, &m,
buf, sizeof( buf ),
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( &grp, NULL, &m, &m,
buf, sizeof( buf ),
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( &grp, &m, NULL, &m,
buf, sizeof( buf ),
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( &grp, &m, &m, NULL,
buf, sizeof( buf ),
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( &grp, &m, &m, &m,
NULL, sizeof( buf ),
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign( &grp, &m, &m, &m,
buf, sizeof( buf ),
@@ -58,27 +63,32 @@
mbedtls_ecdsa_sign_det_ext( NULL, &m, &m, &m,
buf, sizeof( buf ),
valid_md,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign_det_ext( &grp, NULL, &m, &m,
buf, sizeof( buf ),
valid_md,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign_det_ext( &grp, &m, NULL, &m,
buf, sizeof( buf ),
valid_md,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign_det_ext( &grp, &m, &m, NULL,
buf, sizeof( buf ),
valid_md,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_sign_det_ext( &grp, &m, &m, &m,
NULL, sizeof( buf ),
valid_md,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
@@ -103,62 +113,48 @@
&P, &m, NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature( NULL,
- valid_md,
- buf, sizeof( buf ),
- buf, &slen,
- mbedtls_test_rnd_std_rand,
- NULL ) );
- TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature( &ctx,
- valid_md,
- NULL, sizeof( buf ),
- buf, &slen,
- mbedtls_test_rnd_std_rand,
- NULL ) );
- TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature( &ctx,
- valid_md,
- buf, sizeof( buf ),
- NULL, &slen,
- mbedtls_test_rnd_std_rand,
- NULL ) );
- TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature( &ctx,
- valid_md,
- buf, sizeof( buf ),
- buf, NULL,
- mbedtls_test_rnd_std_rand,
- NULL ) );
+ mbedtls_ecdsa_write_signature( NULL, valid_md, buf, sizeof( buf ),
+ buf, &slen, mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature_restartable( NULL,
- valid_md,
- buf, sizeof( buf ),
- buf, &slen,
- mbedtls_test_rnd_std_rand,
- NULL, NULL ) );
+ mbedtls_ecdsa_write_signature( &ctx, valid_md, NULL, sizeof( buf ),
+ buf, &slen, mbedtls_test_rnd_std_rand,
+ NULL ) );
+
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature_restartable( &ctx,
- valid_md,
- NULL, sizeof( buf ),
- buf, &slen,
- mbedtls_test_rnd_std_rand,
- NULL, NULL ) );
+ mbedtls_ecdsa_write_signature( &ctx, valid_md, buf, sizeof( buf ),
+ NULL, &slen, mbedtls_test_rnd_std_rand,
+ NULL ) );
+
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature_restartable( &ctx,
- valid_md,
- buf, sizeof( buf ),
- NULL, &slen,
- mbedtls_test_rnd_std_rand,
- NULL, NULL ) );
+ mbedtls_ecdsa_write_signature( &ctx, valid_md, buf, sizeof( buf ),
+ buf, NULL, mbedtls_test_rnd_std_rand,
+ NULL ) );
+
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
- mbedtls_ecdsa_write_signature_restartable( &ctx,
- valid_md,
- buf, sizeof( buf ),
- buf, NULL,
- mbedtls_test_rnd_std_rand,
- NULL, NULL ) );
+ mbedtls_ecdsa_write_signature_restartable( NULL, valid_md, buf,
+ sizeof( buf ), buf, &slen,
+ mbedtls_test_rnd_std_rand,
+ NULL, NULL ) );
+
+ TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
+ mbedtls_ecdsa_write_signature_restartable( &ctx, valid_md, NULL,
+ sizeof( buf ), buf, &slen,
+ mbedtls_test_rnd_std_rand,
+ NULL, NULL ) );
+
+ TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
+ mbedtls_ecdsa_write_signature_restartable( &ctx, valid_md, buf,
+ sizeof( buf ), NULL, &slen,
+ mbedtls_test_rnd_std_rand,
+ NULL, NULL ) );
+
+ TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
+ mbedtls_ecdsa_write_signature_restartable( &ctx, valid_md, buf,
+ sizeof( buf ), buf, NULL,
+ mbedtls_test_rnd_std_rand,
+ NULL, NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_read_signature( NULL,
@@ -191,7 +187,8 @@
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_genkey( NULL, valid_group,
- mbedtls_test_rnd_std_rand, NULL ) );
+ mbedtls_test_rnd_std_rand,
+ NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_ECP_BAD_INPUT_DATA,
mbedtls_ecdsa_genkey( &ctx, valid_group,
NULL, NULL ) );
@@ -223,13 +220,16 @@
memset( buf, 0, sizeof( buf ) );
/* prepare material for signature */
- TEST_ASSERT( mbedtls_test_rnd_pseudo_rand( &rnd_info, buf, sizeof( buf ) ) == 0 );
+ TEST_ASSERT( mbedtls_test_rnd_pseudo_rand( &rnd_info,
+ buf, sizeof( buf ) ) == 0 );
TEST_ASSERT( mbedtls_ecp_group_load( &grp, id ) == 0 );
- TEST_ASSERT( mbedtls_ecp_gen_keypair( &grp, &d, &Q, &mbedtls_test_rnd_pseudo_rand, &rnd_info )
- == 0 );
+ TEST_ASSERT( mbedtls_ecp_gen_keypair( &grp, &d, &Q,
+ &mbedtls_test_rnd_pseudo_rand,
+ &rnd_info ) == 0 );
TEST_ASSERT( mbedtls_ecdsa_sign( &grp, &r, &s, &d, buf, sizeof( buf ),
- &mbedtls_test_rnd_pseudo_rand, &rnd_info ) == 0 );
+ &mbedtls_test_rnd_pseudo_rand,
+ &rnd_info ) == 0 );
TEST_ASSERT( mbedtls_ecdsa_verify( &grp, buf, sizeof( buf ), &Q, &r, &s ) == 0 );
exit:
@@ -332,7 +332,8 @@
TEST_ASSERT(
mbedtls_ecdsa_sign_det_ext( &grp, &r, &s, &d, hash, hlen,
- md_alg, mbedtls_test_rnd_std_rand, NULL )
+ md_alg, mbedtls_test_rnd_std_rand,
+ NULL )
== 0 );
TEST_ASSERT( mbedtls_mpi_cmp_mpi( &r, &r_check ) == 0 );
@@ -360,15 +361,19 @@
memset( sig, 0x2a, sizeof( sig ) );
/* prepare material for signature */
- TEST_ASSERT( mbedtls_test_rnd_pseudo_rand( &rnd_info, hash, sizeof( hash ) ) == 0 );
+ TEST_ASSERT( mbedtls_test_rnd_pseudo_rand( &rnd_info,
+ hash, sizeof( hash ) ) == 0 );
/* generate signing key */
- TEST_ASSERT( mbedtls_ecdsa_genkey( &ctx, id, &mbedtls_test_rnd_pseudo_rand, &rnd_info ) == 0 );
+ TEST_ASSERT( mbedtls_ecdsa_genkey( &ctx, id,
+ &mbedtls_test_rnd_pseudo_rand,
+ &rnd_info ) == 0 );
/* generate and write signature, then read and verify it */
TEST_ASSERT( mbedtls_ecdsa_write_signature( &ctx, MBEDTLS_MD_SHA256,
hash, sizeof( hash ),
- sig, &sig_len, &mbedtls_test_rnd_pseudo_rand, &rnd_info ) == 0 );
+ sig, &sig_len, &mbedtls_test_rnd_pseudo_rand,
+ &rnd_info ) == 0 );
TEST_ASSERT( mbedtls_ecdsa_read_signature( &ctx, hash, sizeof( hash ),
sig, sig_len ) == 0 );