yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 20:35:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

change RSA encryption tests compensate for random component in encryption.

Browse Source
This commit is contained in:
Nir Sonnenschein 2018-05-02 23:56:12 +03:00 committed by itayzafrir
parent 39e59144f6
commit 0f3bdbddee
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/suites/test_suite_psa_crypto.data
View File

@ -135,11 +135,11 @@ asymmetric_verify:PSA_KEY_TYPE_ECC_KEYPAIR(PSA_KEY_TYPE_ECC_CURVE_NISTP256R1):"3
PSA encrypt using RSA PKCS#1 v1.5 PSA encrypt using RSA PKCS#1 v1.5
depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15
asymmetric_encrypt:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_ALG_RSA_PKCS1V15_RAW:"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad":"99ffde2fcc00c9cc01972ebfa7779b298dbbaf7f50707a7405296dd2783456fc792002f462e760500e02afa25a859ace8701cb5d3b0262116431c43af8eb08f5a88301057cf1c156a2a5193c143e7a5b03fac132b7e89e6dcd8f4c82c9b28452329c260d30bc39b3816b7c46b41b37b4850d2ae74e729f99c6621fbbe2e46872":128 asymmetric_encrypt:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_ALG_RSA_PKCS1V15_RAW:"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"
PSA encrypt using RSA PKCS#1 v1.5 PSA encrypt using RSA PKCS#1 v1.5
depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15
asymmetric_encrypt:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_ALG_RSA_PKCS1V15_RAW:"99e8a6144bcb9a29660303bdc4305bb5eca8c64b96788cad062be9967bdab2f7ffff":"adeecba2db7f867a733853f0136c554e5e01c7a2015721a9bfe30c3ad163b93a9c7589170311209f91420ad8a1a8280c7e890a6d7bca3c500b4da4f53a17bd84a21d58f979a9b4b8f2246b482d930804f12b3aeb2ac8b5ac7938d452ca13be8eb8e973c4e2b19fd454058cbae037bcef7ef68a5fbabf050de5f283cf1998c695":128 asymmetric_encrypt:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_ALG_RSA_PKCS1V15_RAW:"99e8a6144bcb9a29660303bdc4305bb5eca8c64b96788cad062be9967bdab2f7ffff"
PSA encrypt using RSA PKCS#1 v1.5 fail ARGUMENTS PSA encrypt using RSA PKCS#1 v1.5 fail ARGUMENTS
depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15 depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15

77
tests/suites/test_suite_psa_crypto.function
View File

@ -624,8 +624,7 @@ exit:
/* BEGIN_CASE */ /* BEGIN_CASE */
void asymmetric_encrypt( int key_type_arg, char *key_hex, void asymmetric_encrypt( int key_type_arg, char *key_hex,
int alg_arg, char *input_hex, int alg_arg, char *input_hex )
char *expected_hex, int expected_size )
{ {
int slot = 1; int slot = 1;
psa_key_type_t key_type = key_type_arg; psa_key_type_t key_type = key_type_arg;
@ -634,44 +633,52 @@ void asymmetric_encrypt( int key_type_arg, char *key_hex,
size_t key_size; size_t key_size;
unsigned char *input_data = NULL; unsigned char *input_data = NULL;
size_t input_size; size_t input_size;
unsigned char *expected_data = NULL;
size_t expected_data_size;
unsigned char *output = NULL; unsigned char *output = NULL;
size_t output_size = 4096; size_t output_size = 4096;
size_t output_length = 0; size_t output_length = 0;
unsigned char *output2 = NULL;
size_t output2_size = 4096;
size_t output2_length = 0;
key_data = unhexify_alloc( key_hex, &key_size ); key_data = unhexify_alloc( key_hex, &key_size );
TEST_ASSERT( key_data != NULL ); TEST_ASSERT( key_data != NULL );
input_data = unhexify_alloc( input_hex, &input_size ); input_data = unhexify_alloc( input_hex, &input_size );
TEST_ASSERT( input_data != NULL ); TEST_ASSERT( input_data != NULL );
expected_data = unhexify_alloc( expected_hex, &expected_data_size );
TEST_ASSERT( expected_data != NULL );
output = mbedtls_calloc( 1, output_size ); output = mbedtls_calloc( 1, output_size );
TEST_ASSERT( output != NULL ); TEST_ASSERT( output != NULL );
output2 = mbedtls_calloc( 1, output2_size );
TEST_ASSERT( output2 != NULL );
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type, TEST_ASSERT( psa_import_key( slot, key_type,
key_data, key_size ) == PSA_SUCCESS ); key_data, key_size ) == PSA_SUCCESS );
TEST_ASSERT( psa_asymmetric_encrypt(slot, alg, //checked using encrypt/decrpyt because of non-optional random
input_data, // part of encryption process preventing using fixed vectors
input_size, TEST_ASSERT( psa_asymmetric_encrypt(slot, alg,
NULL, 0, input_data,
output, input_size,
output_size, NULL, 0,
output,
output_size,
&output_length) == PSA_SUCCESS ); &output_length) == PSA_SUCCESS );
TEST_ASSERT( ((size_t)expected_size) == output_length );
// function uses random internally TEST_ASSERT( psa_asymmetric_decrypt(slot, alg,
//TEST_ASSERT( memcmp( expected_data, output, output_length ) == 0 ); output,
output_length,
NULL, 0,
output2,
output2_size,
&output2_length) == PSA_SUCCESS );
TEST_ASSERT( memcmp( input_data, output2, input_size ) == 0 );
exit: exit:
psa_destroy_key( slot ); psa_destroy_key( slot );
mbedtls_free( key_data ); mbedtls_free( key_data );
mbedtls_free( input_data ); mbedtls_free( input_data );
mbedtls_free( expected_data );
mbedtls_free( output); mbedtls_free( output);
mbedtls_free( output2);
mbedtls_psa_crypto_free( ); mbedtls_psa_crypto_free( );
} }
@ -711,12 +718,12 @@ void asymmetric_encrypt_fail( int key_type_arg, char *key_hex,
TEST_ASSERT( psa_import_key( slot, key_type, TEST_ASSERT( psa_import_key( slot, key_type,
key_data, key_size ) == PSA_SUCCESS ); key_data, key_size ) == PSA_SUCCESS );
actual_status = psa_asymmetric_encrypt(slot, alg, actual_status = psa_asymmetric_encrypt(slot, alg,
input_data, input_data,
input_size, input_size,
NULL, 0, NULL, 0,
output, output,
output_size, output_size,
&output_length); &output_length);
TEST_ASSERT( actual_status == expected_status ); TEST_ASSERT( actual_status == expected_status );
@ -763,12 +770,12 @@ void asymmetric_decrypt( int key_type_arg, char *key_hex,
TEST_ASSERT( psa_import_key( slot, key_type, TEST_ASSERT( psa_import_key( slot, key_type,
key_data, key_size ) == PSA_SUCCESS ); key_data, key_size ) == PSA_SUCCESS );
TEST_ASSERT( psa_asymmetric_decrypt( slot, alg, TEST_ASSERT( psa_asymmetric_decrypt( slot, alg,
input_data, input_data,
input_size, input_size,
NULL, 0, NULL, 0,
output, output,
output_size, output_size,
&output_length) == PSA_SUCCESS ); &output_length) == PSA_SUCCESS );
TEST_ASSERT( ((size_t)expected_size) == output_length ); TEST_ASSERT( ((size_t)expected_size) == output_length );
TEST_ASSERT( memcmp( expected_data, output, (output_length/8) ) == 0 ); TEST_ASSERT( memcmp( expected_data, output, (output_length/8) ) == 0 );
@ -818,12 +825,12 @@ void asymmetric_decrypt_fail( int key_type_arg, char *key_hex,
TEST_ASSERT( psa_import_key( slot, key_type, TEST_ASSERT( psa_import_key( slot, key_type,
key_data, key_size ) == PSA_SUCCESS ); key_data, key_size ) == PSA_SUCCESS );
actual_status = psa_asymmetric_decrypt(slot, alg, actual_status = psa_asymmetric_decrypt(slot, alg,
input_data, input_data,
input_size, input_size,
NULL, 0, NULL, 0,
output, output,
output_size, output_size,
&output_length); &output_length);
TEST_ASSERT( actual_status == expected_status ); TEST_ASSERT( actual_status == expected_status );