@@ -14,7 +14,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
14
14
data_t * message_str, data_t * rnd_buf,
15
15
data_t * result_hex_str, int result )
16
16
{
17
- unsigned char output[1000 ];
17
+ unsigned char output[256 ];
18
18
mbedtls_rsa_context ctx;
19
19
rnd_buf_info info;
20
20
mbedtls_mpi N, E;
@@ -24,7 +24,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
24
24
25
25
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
26
26
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
27
- memset( output, 0x00, 1000 );
27
+ memset( output, 0x00, sizeof( output ) );
28
28
29
29
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
30
30
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,
54
54
char * seed, data_t * message_str,
55
55
int result )
56
56
{
57
- unsigned char output[1000 ];
57
+ unsigned char output[64 ];
58
58
mbedtls_rsa_context ctx;
59
59
size_t output_len;
60
60
rnd_pseudo_info rnd_info;
@@ -66,7 +66,7 @@ void pkcs1_rsaes_oaep_decrypt( int mod, int radix_P, char * input_P,
66
66
67
67
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
68
68
69
- memset( output, 0x00, 1000 );
69
+ memset( output, 0x00, sizeof( output ) );
70
70
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
71
71
72
72
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,
81
81
82
82
if( result_hex_str->len == 0 )
83
83
{
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 );
85
87
}
86
88
else
87
89
{
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 );
89
94
if( result == 0 )
90
95
{
91
96
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,
106
111
data_t * message_str, data_t * rnd_buf,
107
112
data_t * result_hex_str, int result )
108
113
{
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 ];
111
116
mbedtls_rsa_context ctx;
112
117
rnd_buf_info info;
113
118
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,
119
124
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
120
125
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
121
126
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 ) );
124
129
125
130
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
126
131
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,
157
162
int hash, data_t * message_str, char * salt,
158
163
data_t * result_str, int result )
159
164
{
160
- unsigned char hash_result[1000 ];
165
+ unsigned char hash_result[MBEDTLS_MD_MAX_SIZE ];
161
166
mbedtls_rsa_context ctx;
162
167
mbedtls_mpi N, E;
163
168
((void) salt);
164
169
165
170
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
166
171
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
167
- memset( hash_result, 0x00, 1000 );
172
+ memset( hash_result, 0x00, sizeof( hash_result ) );
168
173
169
174
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
170
175
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,
194
199
data_t * result_str, int result_simple,
195
200
int result_full )
196
201
{
197
- unsigned char hash_result[1000 ];
202
+ unsigned char hash_result[MBEDTLS_MD_MAX_SIZE ];
198
203
mbedtls_rsa_context ctx;
199
204
size_t hash_len;
200
205
mbedtls_mpi N, E;
201
206
202
207
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
203
208
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, ctx_hash );
204
- memset( hash_result, 0x00, 1000 );
209
+ memset( hash_result, 0x00, sizeof( hash_result ) );
205
210
206
211
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
207
212
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
0 commit comments