Skip to content

Commit e4209c0

Browse files
PataterPatater
authored
Merge pull request #278 from RonEld/fix_on_target_test_issues
Fix on target test issues
2 parents a990c49 + 038ab05 commit e4209c0

File tree

6 files changed

+81
-75
lines changed

6 files changed

+81
-75
lines changed

‎tests/suites/target_test.function

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ uint8_t receive_byte()
7575
c[1] = greentea_getc();
7676
c[2] = '\0';
7777

78-
assert( unhexify( &byte, c ) != 2 );
78+
TEST_HELPER_ASSERT( unhexify( &byte, c ) != 2 );
7979
return( byte );
8080
}
8181

@@ -90,18 +90,19 @@ uint8_t receive_byte()
9090
uint32_t receive_uint32()
9191
{
9292
uint32_t value;
93-
const uint8_t c[9] = { greentea_getc(),
94-
greentea_getc(),
95-
greentea_getc(),
96-
greentea_getc(),
97-
greentea_getc(),
98-
greentea_getc(),
99-
greentea_getc(),
100-
greentea_getc(),
101-
'\0'
102-
};
103-
assert( unhexify( &value, c ) != 8 );
104-
return( (uint32_t)value );
93+
const uint8_t c_be[8] = { greentea_getc(),
94+
greentea_getc(),
95+
greentea_getc(),
96+
greentea_getc(),
97+
greentea_getc(),
98+
greentea_getc(),
99+
greentea_getc(),
100+
greentea_getc()
101+
};
102+
const uint8_t c[9] = { c_be[6], c_be[7], c_be[4], c_be[5], c_be[2],
103+
c_be[3], c_be[0], c_be[1], '\0' };
104+
TEST_HELPER_ASSERT( unhexify( (uint8_t*)&value, c ) != 8 );
105+
return( value );
105106
}
106107

107108
/**
@@ -368,7 +369,7 @@ int execute_tests( int args, const char ** argv )
368369
void ** params = NULL;
369370
uint8_t * data = NULL, * p = NULL;
370371

371-
GREENTEA_SETUP( 180, "mbedtls_test" );
372+
GREENTEA_SETUP( 800, "mbedtls_test" );
372373
greentea_send_kv( "GO", " " );
373374

374375
while ( 1 )

‎tests/suites/test_suite_pk.function

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ void pk_rsa_verify_test_vec( data_t * message_str, int digest, int mod,
664664
char * input_E, data_t * result_str,
665665
int result )
666666
{
667-
unsigned char hash_result[1000];
667+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
668668
mbedtls_rsa_context *rsa;
669669
mbedtls_pk_context pk;
670670
mbedtls_pk_restart_ctx *rs_ctx = NULL;
@@ -679,7 +679,7 @@ void pk_rsa_verify_test_vec( data_t * message_str, int digest, int mod,
679679

680680
mbedtls_pk_init( &pk );
681681

682-
memset( hash_result, 0x00, 1000 );
682+
memset( hash_result, 0x00, MBEDTLS_MD_MAX_SIZE );
683683

684684
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
685685
rsa = mbedtls_pk_rsa( pk );
@@ -713,7 +713,7 @@ void pk_rsa_verify_ext_test_vec( data_t * message_str, int digest,
713713
data_t * result_str, int pk_type,
714714
int mgf1_hash_id, int salt_len, int result )
715715
{
716-
unsigned char hash_result[1000];
716+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
717717
mbedtls_rsa_context *rsa;
718718
mbedtls_pk_context pk;
719719
mbedtls_pk_rsassa_pss_options pss_opts;
@@ -722,7 +722,7 @@ void pk_rsa_verify_ext_test_vec( data_t * message_str, int digest,
722722

723723
mbedtls_pk_init( &pk );
724724

725-
memset( hash_result, 0x00, 1000 );
725+
memset( hash_result, 0x00, sizeof( hash_result ) );
726726

727727
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
728728
rsa = mbedtls_pk_rsa( pk );
@@ -976,7 +976,7 @@ void pk_rsa_encrypt_test_vec( data_t * message, int mod, int radix_N,
976976
char * input_N, int radix_E, char * input_E,
977977
data_t * result, int ret )
978978
{
979-
unsigned char output[1000];
979+
unsigned char output[300];
980980
rnd_pseudo_info rnd_info;
981981
mbedtls_rsa_context *rsa;
982982
mbedtls_pk_context pk;
@@ -1011,7 +1011,7 @@ void pk_rsa_decrypt_test_vec( data_t * cipher, int mod, int radix_P,
10111011
int radix_N, char * input_N, int radix_E,
10121012
char * input_E, data_t * clear, int ret )
10131013
{
1014-
unsigned char output[1000];
1014+
unsigned char output[256];
10151015
rnd_pseudo_info rnd_info;
10161016
mbedtls_mpi N, P, Q, E;
10171017
mbedtls_rsa_context *rsa;
@@ -1136,8 +1136,8 @@ void pk_rsa_alt( )
11361136
mbedtls_rsa_context raw;
11371137
mbedtls_pk_context rsa, alt;
11381138
mbedtls_pk_debug_item dbg_items[10];
1139-
unsigned char hash[50], sig[1000];
1140-
unsigned char msg[50], ciph[1000], test[1000];
1139+
unsigned char hash[50], sig[64];
1140+
unsigned char msg[50], ciph[64], test[50];
11411141
size_t sig_len, ciph_len, test_len;
11421142
int ret = MBEDTLS_ERR_PK_TYPE_MISMATCH;
11431143

‎tests/suites/test_suite_pkcs1_v15.function

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void pkcs1_rsaes_v15_encrypt( int mod, int radix_N, char * input_N,
1414
data_t * message_str, data_t * rnd_buf,
1515
data_t * result_hex_str, int result )
1616
{
17-
unsigned char output[1000];
17+
unsigned char output[128];
1818
mbedtls_rsa_context ctx;
1919
rnd_buf_info info;
2020
mbedtls_mpi N, E;
@@ -24,7 +24,7 @@ void pkcs1_rsaes_v15_encrypt( int mod, int radix_N, char * input_N,
2424

2525
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
2626
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
27-
memset( output, 0x00, 1000 );
27+
memset( output, 0x00, sizeof( output ) );
2828

2929
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
3030
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@@ -54,7 +54,7 @@ void pkcs1_rsaes_v15_decrypt( int mod, int radix_P, char * input_P,
5454
char * seed, data_t * message_str,
5555
int result )
5656
{
57-
unsigned char output[1000];
57+
unsigned char output[128];
5858
mbedtls_rsa_context ctx;
5959
size_t output_len;
6060
rnd_pseudo_info rnd_info;
@@ -65,7 +65,7 @@ void pkcs1_rsaes_v15_decrypt( int mod, int radix_P, char * input_P,
6565
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
6666
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
6767

68-
memset( output, 0x00, 1000 );
68+
memset( output, 0x00, sizeof( output ) );
6969
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
7070

7171
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
@@ -253,8 +253,8 @@ void pkcs1_rsassa_v15_sign( int mod, int radix_P, char * input_P, int radix_Q,
253253
data_t * message_str, data_t * rnd_buf,
254254
data_t * result_hex_str, int result )
255255
{
256-
unsigned char hash_result[1000];
257-
unsigned char output[1000];
256+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
257+
unsigned char output[128];
258258
mbedtls_rsa_context ctx;
259259
mbedtls_mpi N, P, Q, E;
260260
rnd_buf_info info;
@@ -266,8 +266,8 @@ void pkcs1_rsassa_v15_sign( int mod, int radix_P, char * input_P, int radix_Q,
266266
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
267267
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
268268

269-
memset( hash_result, 0x00, 1000 );
270-
memset( output, 0x00, 1000 );
269+
memset( hash_result, 0x00, sizeof( hash_result ) );
270+
memset( output, 0x00, sizeof( output ) );
271271

272272
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
273273
TEST_ASSERT( mbedtls_mpi_read_string( &Q, radix_Q, input_Q ) == 0 );
@@ -303,14 +303,14 @@ void pkcs1_rsassa_v15_verify( int mod, int radix_N, char * input_N,
303303
int hash, data_t * message_str, char * salt,
304304
data_t * result_str, int result )
305305
{
306-
unsigned char hash_result[1000];
306+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
307307
mbedtls_rsa_context ctx;
308308
mbedtls_mpi N, E;
309309
((void) salt);
310310

311311
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
312312
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
313-
memset( hash_result, 0x00, 1000 );
313+
memset( hash_result, 0x00, sizeof( hash_result ) );
314314

315315
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
316316
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );

‎tests/suites/test_suite_pkcs1_v21.function

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
1414
data_t * message_str, data_t * rnd_buf,
1515
data_t * result_hex_str, int result )
1616
{
17-
unsigned char output[1000];
17+
unsigned char output[256];
1818
mbedtls_rsa_context ctx;
1919
rnd_buf_info info;
2020
mbedtls_mpi N, E;
@@ -24,7 +24,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
2424

2525
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
2626
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
27-
memset( output, 0x00, 1000 );
27+
memset( output, 0x00, sizeof( output ) );
2828

2929
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
3030
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@@ -54,7 +54,7 @@ void pkcs1_rsaes_oaep_decrypt( int mod, int radix_P, char * input_P,
5454
char * seed, data_t * message_str,
5555
int result )
5656
{
57-
unsigned char output[1000];
57+
unsigned char output[64];
5858
mbedtls_rsa_context ctx;
5959
size_t output_len;
6060
rnd_pseudo_info rnd_info;
@@ -66,7 +66,7 @@ void pkcs1_rsaes_oaep_decrypt( int mod, int radix_P, char * input_P,
6666

6767
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
6868

69-
memset( output, 0x00, 1000 );
69+
memset( output, 0x00, sizeof( output ) );
7070
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
7171

7272
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
@@ -81,11 +81,16 @@ void pkcs1_rsaes_oaep_decrypt( int mod, int radix_P, char * input_P,
8181

8282
if( result_hex_str->len == 0 )
8383
{
84-
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE, &output_len, message_str->x, NULL, 0 ) == result );
84+
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info,
85+
MBEDTLS_RSA_PRIVATE, &output_len,
86+
message_str->x, NULL, 0 ) == result );
8587
}
8688
else
8789
{
88-
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE, &output_len, message_str->x, output, 1000 ) == result );
90+
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info,
91+
MBEDTLS_RSA_PRIVATE, &output_len,
92+
message_str->x, output,
93+
sizeof( output ) ) == result );
8994
if( result == 0 )
9095
{
9196
TEST_ASSERT( hexcmp( output, result_hex_str->x, output_len, result_hex_str->len ) == 0 );
@@ -106,8 +111,8 @@ void pkcs1_rsassa_pss_sign( int mod, int radix_P, char * input_P, int radix_Q,
106111
data_t * message_str, data_t * rnd_buf,
107112
data_t * result_hex_str, int result )
108113
{
109-
unsigned char hash_result[1000];
110-
unsigned char output[1000];
114+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
115+
unsigned char output[256];
111116
mbedtls_rsa_context ctx;
112117
rnd_buf_info info;
113118
mbedtls_mpi N, P, Q, E;
@@ -119,8 +124,8 @@ void pkcs1_rsassa_pss_sign( int mod, int radix_P, char * input_P, int radix_Q,
119124
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
120125
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
121126

122-
memset( hash_result, 0x00, 1000 );
123-
memset( output, 0x00, 1000 );
127+
memset( hash_result, 0x00, sizeof( hash_result ) );
128+
memset( output, 0x00, sizeof( output ) );
124129

125130
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
126131
TEST_ASSERT( mbedtls_mpi_read_string( &Q, radix_Q, input_Q ) == 0 );
@@ -157,14 +162,14 @@ void pkcs1_rsassa_pss_verify( int mod, int radix_N, char * input_N,
157162
int hash, data_t * message_str, char * salt,
158163
data_t * result_str, int result )
159164
{
160-
unsigned char hash_result[1000];
165+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
161166
mbedtls_rsa_context ctx;
162167
mbedtls_mpi N, E;
163168
((void) salt);
164169

165170
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
166171
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
167-
memset( hash_result, 0x00, 1000 );
172+
memset( hash_result, 0x00, sizeof( hash_result ) );
168173

169174
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
170175
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@@ -194,14 +199,14 @@ void pkcs1_rsassa_pss_verify_ext( int mod, int radix_N, char * input_N,
194199
data_t * result_str, int result_simple,
195200
int result_full )
196201
{
197-
unsigned char hash_result[1000];
202+
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
198203
mbedtls_rsa_context ctx;
199204
size_t hash_len;
200205
mbedtls_mpi N, E;
201206

202207
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
203208
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, ctx_hash );
204-
memset( hash_result, 0x00, 1000 );
209+
memset( hash_result, 0x00, sizeof( hash_result ) );
205210

206211
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
207212
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );

0 commit comments

Comments
 (0)