yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 08:34:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #278 from RonEld/fix_on_target_test_issues

Browse Source 
Fix on target test issues
This commit is contained in:
Jaeden Amero 2019-10-03 14:10:05 +01:00 committed by GitHub
commit e4209c0e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/suites/target_test.function
View File

@ -75,7 +75,7 @@ uint8_t receive_byte()
c[1] = greentea_getc(); c[1] = greentea_getc();
c[2] = '\0'; c[2] = '\0';
assert( unhexify( &byte, c ) != 2 ); TEST_HELPER_ASSERT( unhexify( &byte, c ) != 2 );
return( byte ); return( byte );
} }
@ -90,18 +90,19 @@ uint8_t receive_byte()
uint32_t receive_uint32() uint32_t receive_uint32()
{ {
uint32_t value; uint32_t value;
const uint8_t c[9] = { greentea_getc(), const uint8_t c_be[8] = { greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc(),
greentea_getc(), greentea_getc()
'\0'
}; };
assert( unhexify( &value, c ) != 8 ); const uint8_t c[9] = { c_be[6], c_be[7], c_be[4], c_be[5], c_be[2],
return( (uint32_t)value ); c_be[3], c_be[0], c_be[1], '\0' };
TEST_HELPER_ASSERT( unhexify( (uint8_t*)&value, c ) != 8 );
return( value );
} }
/** /**
@ -368,7 +369,7 @@ int execute_tests( int args, const char ** argv )
void ** params = NULL; void ** params = NULL;
uint8_t * data = NULL, * p = NULL; uint8_t * data = NULL, * p = NULL;
GREENTEA_SETUP( 180, "mbedtls_test" ); GREENTEA_SETUP( 800, "mbedtls_test" );
greentea_send_kv( "GO", " " ); greentea_send_kv( "GO", " " );
while ( 1 ) while ( 1 )

16
tests/suites/test_suite_pk.function
View File

@ -664,7 +664,7 @@ void pk_rsa_verify_test_vec( data_t * message_str, int digest, int mod,
char * input_E, data_t * result_str, char * input_E, data_t * result_str,
int result ) int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context *rsa; mbedtls_rsa_context *rsa;
mbedtls_pk_context pk; mbedtls_pk_context pk;
mbedtls_pk_restart_ctx *rs_ctx = NULL; 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,
mbedtls_pk_init( &pk ); mbedtls_pk_init( &pk );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, MBEDTLS_MD_MAX_SIZE );
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 ); TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
rsa = mbedtls_pk_rsa( pk ); rsa = mbedtls_pk_rsa( pk );
@ -713,7 +713,7 @@ void pk_rsa_verify_ext_test_vec( data_t * message_str, int digest,
data_t * result_str, int pk_type, data_t * result_str, int pk_type,
int mgf1_hash_id, int salt_len, int result ) int mgf1_hash_id, int salt_len, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context *rsa; mbedtls_rsa_context *rsa;
mbedtls_pk_context pk; mbedtls_pk_context pk;
mbedtls_pk_rsassa_pss_options pss_opts; mbedtls_pk_rsassa_pss_options pss_opts;
@ -722,7 +722,7 @@ void pk_rsa_verify_ext_test_vec( data_t * message_str, int digest,
mbedtls_pk_init( &pk ); mbedtls_pk_init( &pk );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 ); TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
rsa = mbedtls_pk_rsa( pk ); rsa = mbedtls_pk_rsa( pk );
@ -976,7 +976,7 @@ void pk_rsa_encrypt_test_vec( data_t * message, int mod, int radix_N,
char * input_N, int radix_E, char * input_E, char * input_N, int radix_E, char * input_E,
data_t * result, int ret ) data_t * result, int ret )
{ {
unsigned char output[1000]; unsigned char output[300];
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
mbedtls_rsa_context *rsa; mbedtls_rsa_context *rsa;
mbedtls_pk_context pk; mbedtls_pk_context pk;
@ -1011,7 +1011,7 @@ void pk_rsa_decrypt_test_vec( data_t * cipher, int mod, int radix_P,
int radix_N, char * input_N, int radix_E, int radix_N, char * input_N, int radix_E,
char * input_E, data_t * clear, int ret ) char * input_E, data_t * clear, int ret )
{ {
unsigned char output[1000]; unsigned char output[256];
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
mbedtls_mpi N, P, Q, E; mbedtls_mpi N, P, Q, E;
mbedtls_rsa_context *rsa; mbedtls_rsa_context *rsa;
@ -1136,8 +1136,8 @@ void pk_rsa_alt( )
mbedtls_rsa_context raw; mbedtls_rsa_context raw;
mbedtls_pk_context rsa, alt; mbedtls_pk_context rsa, alt;
mbedtls_pk_debug_item dbg_items[10]; mbedtls_pk_debug_item dbg_items[10];
unsigned char hash[50], sig[1000]; unsigned char hash[50], sig[64];
unsigned char msg[50], ciph[1000], test[1000]; unsigned char msg[50], ciph[64], test[50];
size_t sig_len, ciph_len, test_len; size_t sig_len, ciph_len, test_len;
int ret = MBEDTLS_ERR_PK_TYPE_MISMATCH; int ret = MBEDTLS_ERR_PK_TYPE_MISMATCH;

20
tests/suites/test_suite_pkcs1_v15.function
View File

@ -14,7 +14,7 @@ void pkcs1_rsaes_v15_encrypt( int mod, int radix_N, char * input_N,
data_t * message_str, data_t * rnd_buf, data_t * message_str, data_t * rnd_buf,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char output[1000]; unsigned char output[128];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
rnd_buf_info info; rnd_buf_info info;
mbedtls_mpi N, E; mbedtls_mpi N, E;
@ -24,7 +24,7 @@ void pkcs1_rsaes_v15_encrypt( int mod, int radix_N, char * input_N,
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); 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,
char * seed, data_t * message_str, char * seed, data_t * message_str,
int result ) int result )
{ {
unsigned char output[1000]; unsigned char output[128];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
size_t output_len; size_t output_len;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -65,7 +65,7 @@ void pkcs1_rsaes_v15_decrypt( int mod, int radix_P, char * input_P,
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); 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,
data_t * message_str, data_t * rnd_buf, data_t * message_str, data_t * rnd_buf,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
unsigned char output[1000]; unsigned char output[128];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, P, Q, E; mbedtls_mpi N, P, Q, E;
rnd_buf_info info; rnd_buf_info info;
@ -266,8 +266,8 @@ void pkcs1_rsassa_v15_sign( int mod, int radix_P, char * input_P, int radix_Q,
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &Q, radix_Q, input_Q ) == 0 ); 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,
int hash, data_t * message_str, char * salt, int hash, data_t * message_str, char * salt,
data_t * result_str, int result ) data_t * result_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, E; mbedtls_mpi N, E;
((void) salt); ((void) salt);
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, hash );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );

33
tests/suites/test_suite_pkcs1_v21.function
View File

@ -14,7 +14,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
data_t * message_str, data_t * rnd_buf, data_t * message_str, data_t * rnd_buf,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
rnd_buf_info info; rnd_buf_info info;
mbedtls_mpi N, E; mbedtls_mpi N, E;
@ -24,7 +24,7 @@ void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char * input_N,
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); 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,
char * seed, data_t * message_str, char * seed, data_t * message_str,
int result ) int result )
{ {
unsigned char output[1000]; unsigned char output[64];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
size_t output_len; size_t output_len;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -66,7 +66,7 @@ void pkcs1_rsaes_oaep_decrypt( int mod, int radix_P, char * input_P,
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); 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,
if( result_hex_str->len == 0 ) if( result_hex_str->len == 0 )
{ {
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE, &output_len, message_str->x, NULL, 0 ) == result ); TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info,
MBEDTLS_RSA_PRIVATE, &output_len,
message_str->x, NULL, 0 ) == result );
} }
else else
{ {
TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE, &output_len, message_str->x, output, 1000 ) == result ); TEST_ASSERT( mbedtls_rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info,
MBEDTLS_RSA_PRIVATE, &output_len,
message_str->x, output,
sizeof( output ) ) == result );
if( result == 0 ) if( result == 0 )
{ {
TEST_ASSERT( hexcmp( output, result_hex_str->x, output_len, result_hex_str->len ) == 0 ); 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,
data_t * message_str, data_t * rnd_buf, data_t * message_str, data_t * rnd_buf,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
rnd_buf_info info; rnd_buf_info info;
mbedtls_mpi N, P, Q, E; 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,
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &Q, radix_Q, input_Q ) == 0 ); 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,
int hash, data_t * message_str, char * salt, int hash, data_t * message_str, char * salt,
data_t * result_str, int result ) data_t * result_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, E; mbedtls_mpi N, E;
((void) salt); ((void) salt);
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, hash );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); 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,
data_t * result_str, int result_simple, data_t * result_str, int result_simple,
int result_full ) int result_full )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
size_t hash_len; size_t hash_len;
mbedtls_mpi N, E; mbedtls_mpi N, E;
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, ctx_hash ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V21, ctx_hash );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );

4
tests/suites/test_suite_rsa.data
View File

@ -272,7 +272,7 @@ mbedtls_rsa_pkcs1_encrypt:"4E636AF98E40F3ADCFCCB698F4E80B9F":MBEDTLS_RSA_PKCS_V1
RSA PKCS1 Decrypt #1 (Verify) RSA PKCS1 Decrypt #1 (Verify)
depends_on:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PKCS1_V15
mbedtls_rsa_pkcs1_decrypt:"a42eda41e56235e666e7faaa77100197f657288a1bf183e4820f0c37ce2c456b960278d6003e0bbcd4be4a969f8e8fd9231e1f492414f00ed09844994c86ec32db7cde3bec7f0c3dbf6ae55baeb2712fa609f5fc3207a824eb3dace31849cd6a6084318523912bccb84cf42e3c6d6d1685131d69bb545acec827d2b0dfdd5568b7dcc4f5a11d6916583fefa689d367f8c9e1d95dcd2240895a9470b0c1730f97cd6e8546860bd254801769f54be96e16362ddcbf34d56035028890199e0f48db38642cb66a4181e028a6443a404fea284ce02b4614b683367d40874e505611d23142d49f06feea831d52d347b13610b413c4efc43a6de9f0b08d2a951dc503b6":MBEDTLS_RSA_PKCS_V15:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":1000:"4E636AF98E40F3ADCFCCB698F4E80B9F":0 mbedtls_rsa_pkcs1_decrypt:"a42eda41e56235e666e7faaa77100197f657288a1bf183e4820f0c37ce2c456b960278d6003e0bbcd4be4a969f8e8fd9231e1f492414f00ed09844994c86ec32db7cde3bec7f0c3dbf6ae55baeb2712fa609f5fc3207a824eb3dace31849cd6a6084318523912bccb84cf42e3c6d6d1685131d69bb545acec827d2b0dfdd5568b7dcc4f5a11d6916583fefa689d367f8c9e1d95dcd2240895a9470b0c1730f97cd6e8546860bd254801769f54be96e16362ddcbf34d56035028890199e0f48db38642cb66a4181e028a6443a404fea284ce02b4614b683367d40874e505611d23142d49f06feea831d52d347b13610b413c4efc43a6de9f0b08d2a951dc503b6":MBEDTLS_RSA_PKCS_V15:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":32:"4E636AF98E40F3ADCFCCB698F4E80B9F":0
RSA PKCS1 Encrypt #2 (Data too large) RSA PKCS1 Encrypt #2 (Data too large)
depends_on:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PKCS1_V15
@ -280,7 +280,7 @@ mbedtls_rsa_pkcs1_encrypt:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c
RSA PKCS1 Decrypt #2 (Data too small) RSA PKCS1 Decrypt #2 (Data too small)
depends_on:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PKCS1_V15
mbedtls_rsa_pkcs1_decrypt:"deadbeafcafedeadbeeffedcba9876":MBEDTLS_RSA_PKCS_V15:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":1000:"4E636AF98E40F3ADCFCCB698F4E80B9F":MBEDTLS_ERR_RSA_PRIVATE_FAILED + MBEDTLS_ERR_MPI_BAD_INPUT_DATA mbedtls_rsa_pkcs1_decrypt:"deadbeafcafedeadbeeffedcba9876":MBEDTLS_RSA_PKCS_V15:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":32:"4E636AF98E40F3ADCFCCB698F4E80B9F":MBEDTLS_ERR_RSA_PRIVATE_FAILED + MBEDTLS_ERR_MPI_BAD_INPUT_DATA
RSA PKCS1 Decrypt #4 (Output buffer too small) RSA PKCS1 Decrypt #4 (Output buffer too small)
depends_on:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PKCS1_V15

54
tests/suites/test_suite_rsa.function
View File

@ -472,8 +472,8 @@ void mbedtls_rsa_pkcs1_sign( data_t * message_str, int padding_mode,
char * input_N, int radix_E, char * input_E, char * input_N, int radix_E, char * input_E,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, P, Q, E; mbedtls_mpi N, P, Q, E;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -482,8 +482,8 @@ void mbedtls_rsa_pkcs1_sign( data_t * message_str, int padding_mode,
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, padding_mode, 0 ); mbedtls_rsa_init( &ctx, padding_mode, 0 );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
@ -522,14 +522,14 @@ void mbedtls_rsa_pkcs1_verify( data_t * message_str, int padding_mode,
char * input_N, int radix_E, char * input_E, char * input_N, int radix_E, char * input_E,
data_t * result_str, int result ) data_t * result_str, int result )
{ {
unsigned char hash_result[1000]; unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, E; mbedtls_mpi N, E;
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, padding_mode, 0 ); mbedtls_rsa_init( &ctx, padding_mode, 0 );
memset( hash_result, 0x00, 1000 ); memset( hash_result, 0x00, sizeof( hash_result ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@ -557,7 +557,7 @@ void rsa_pkcs1_sign_raw( data_t * hash_result,
int radix_N, char * input_N, int radix_E, int radix_N, char * input_N, int radix_E,
char * input_E, data_t * result_hex_str ) char * input_E, data_t * result_hex_str )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, P, Q, E; mbedtls_mpi N, P, Q, E;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -566,7 +566,7 @@ void rsa_pkcs1_sign_raw( data_t * hash_result,
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &P ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &P );
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &P, radix_P, input_P ) == 0 );
@ -593,7 +593,7 @@ void rsa_pkcs1_sign_raw( data_t * hash_result,
if( padding_mode == MBEDTLS_RSA_PKCS_V15 ) if( padding_mode == MBEDTLS_RSA_PKCS_V15 )
{ {
int res; int res;
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output) );
res = mbedtls_rsa_rsaes_pkcs1_v15_encrypt( &ctx, res = mbedtls_rsa_rsaes_pkcs1_v15_encrypt( &ctx,
&rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE, &rnd_pseudo_rand, &rnd_info, MBEDTLS_RSA_PRIVATE,
@ -627,7 +627,7 @@ void rsa_pkcs1_verify_raw( data_t * hash_result,
char * input_N, int radix_E, char * input_E, char * input_N, int radix_E, char * input_E,
data_t * result_str, int correct ) data_t * result_str, int correct )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, E; mbedtls_mpi N, E;
@ -688,7 +688,7 @@ void mbedtls_rsa_pkcs1_encrypt( data_t * message_str, int padding_mode,
int radix_E, char * input_E, int radix_E, char * input_E,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -698,7 +698,7 @@ void mbedtls_rsa_pkcs1_encrypt( data_t * message_str, int padding_mode,
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
mbedtls_rsa_init( &ctx, padding_mode, 0 ); mbedtls_rsa_init( &ctx, padding_mode, 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@ -729,14 +729,14 @@ void rsa_pkcs1_encrypt_bad_rng( data_t * message_str, int padding_mode,
int radix_E, char * input_E, int radix_E, char * input_E,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
mbedtls_mpi N, E; mbedtls_mpi N, E;
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, padding_mode, 0 ); mbedtls_rsa_init( &ctx, padding_mode, 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@ -769,7 +769,7 @@ void mbedtls_rsa_pkcs1_decrypt( data_t * message_str, int padding_mode,
int max_output, data_t * result_hex_str, int max_output, data_t * result_hex_str,
int result ) int result )
{ {
unsigned char output[1000]; unsigned char output[32];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;
size_t output_len; size_t output_len;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -780,7 +780,7 @@ void mbedtls_rsa_pkcs1_decrypt( data_t * message_str, int padding_mode,
mbedtls_rsa_init( &ctx, padding_mode, 0 ); mbedtls_rsa_init( &ctx, padding_mode, 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) ); memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
@ -815,7 +815,7 @@ void mbedtls_rsa_public( data_t * message_str, int mod, int radix_N,
char * input_N, int radix_E, char * input_E, char * input_N, int radix_E, char * input_E,
data_t * result_hex_str, int result ) data_t * result_hex_str, int result )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx, ctx2; /* Also test mbedtls_rsa_copy() while at it */ mbedtls_rsa_context ctx, ctx2; /* Also test mbedtls_rsa_copy() while at it */
mbedtls_mpi N, E; mbedtls_mpi N, E;
@ -823,7 +823,7 @@ void mbedtls_rsa_public( data_t * message_str, int mod, int radix_N,
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &E );
mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, 0 ); mbedtls_rsa_init( &ctx, MBEDTLS_RSA_PKCS_V15, 0 );
mbedtls_rsa_init( &ctx2, MBEDTLS_RSA_PKCS_V15, 0 ); mbedtls_rsa_init( &ctx2, MBEDTLS_RSA_PKCS_V15, 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &E, radix_E, input_E ) == 0 );
@ -847,7 +847,7 @@ void mbedtls_rsa_public( data_t * message_str, int mod, int radix_N,
TEST_ASSERT( mbedtls_rsa_check_pubkey( &ctx2 ) == 0 ); TEST_ASSERT( mbedtls_rsa_check_pubkey( &ctx2 ) == 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_rsa_public( &ctx2, message_str->x, output ) == result ); TEST_ASSERT( mbedtls_rsa_public( &ctx2, message_str->x, output ) == result );
if( result == 0 ) if( result == 0 )
{ {
@ -869,7 +869,7 @@ void mbedtls_rsa_private( data_t * message_str, int mod, int radix_P,
char * input_E, data_t * result_hex_str, char * input_E, data_t * result_hex_str,
int result ) int result )
{ {
unsigned char output[1000]; unsigned char output[256];
mbedtls_rsa_context ctx, ctx2; /* Also test mbedtls_rsa_copy() while at it */ mbedtls_rsa_context ctx, ctx2; /* Also test mbedtls_rsa_copy() while at it */
mbedtls_mpi N, P, Q, E; mbedtls_mpi N, P, Q, E;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -896,7 +896,7 @@ void mbedtls_rsa_private( data_t * message_str, int mod, int radix_P,
/* repeat three times to test updating of blinding values */ /* repeat three times to test updating of blinding values */
for( i = 0; i < 3; i++ ) for( i = 0; i < 3; i++ )
{ {
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_rsa_private( &ctx, rnd_pseudo_rand, &rnd_info, TEST_ASSERT( mbedtls_rsa_private( &ctx, rnd_pseudo_rand, &rnd_info,
message_str->x, output ) == result ); message_str->x, output ) == result );
if( result == 0 ) if( result == 0 )
@ -913,7 +913,7 @@ void mbedtls_rsa_private( data_t * message_str, int mod, int radix_P,
TEST_ASSERT( mbedtls_rsa_check_privkey( &ctx2 ) == 0 ); TEST_ASSERT( mbedtls_rsa_check_privkey( &ctx2 ) == 0 );
memset( output, 0x00, 1000 ); memset( output, 0x00, sizeof( output ) );
TEST_ASSERT( mbedtls_rsa_private( &ctx2, rnd_pseudo_rand, &rnd_info, TEST_ASSERT( mbedtls_rsa_private( &ctx2, rnd_pseudo_rand, &rnd_info,
message_str->x, output ) == result ); message_str->x, output ) == result );
if( result == 0 ) if( result == 0 )
@ -1577,11 +1577,11 @@ void mbedtls_rsa_export_raw( data_t *input_N, data_t *input_P,
int successive ) int successive )
{ {
/* Exported buffers */ /* Exported buffers */
unsigned char bufNe[1000]; unsigned char bufNe[256];
unsigned char bufPe[1000]; unsigned char bufPe[128];
unsigned char bufQe[1000]; unsigned char bufQe[128];
unsigned char bufDe[1000]; unsigned char bufDe[256];
unsigned char bufEe[1000]; unsigned char bufEe[1];
mbedtls_rsa_context ctx; mbedtls_rsa_context ctx;