yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 16:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
3111981d94
mbedtls/tests/suites/test_suite_psa_crypto.function

3498 lines
126 KiB
Plaintext
Raw Normal View History

Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
/* BEGIN_HEADER */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
#include <stdint.h>
Modifications for psa-crypto in order to integrate with SPM Add required includes in tests and psa_crypto.c file in order to be able to compilef for the SPM solution. Some functions needed to be deprecated from psa_crypto.c since they already implemented in the SPM.
2018-07-03 12:16:15 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_SPM)
#include "spm/psa_defs.h"
#endif
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
#include "mbedtls/asn1.h"
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
#include "mbedtls/asn1write.h"
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
#include "mbedtls/oid.h"
Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
#include "psa/crypto.h"
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
HKDF: positive tests
2018-07-12 17:24:54 +02:00
#define ARRAY_LENGTH( array ) ( sizeof( array ) / sizeof( *( array ) ) )
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
#if(UINT32_MAX > SIZE_MAX)
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
#define PSA_CRYPTO_TEST_SIZE_T_RANGE( x ) ( ( x ) <= SIZE_MAX )
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
#else
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
#define PSA_CRYPTO_TEST_SIZE_T_RANGE( x ) 1
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
#endif
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
psa_export_key: Always set a valid data length Make psa_export_key() always set a valid data_length when exporting, even when there are errors. This makes the API easier to use for buggy programs (like our test code). Our test code previously used exported_length uninitialized when checking to see that the buffer returned was all zero in import_export() in the case where an error was returned from psa_export_key(). Initialize exported_length to an invalid length, and check that it gets set properly by psa_export_key(), to avoid this using export_length uninitialized. Note that the mem_is_zero() check is still valid when psa_export_key() returns an error, e.g. where exported_length is 0, as we want to check that nothing was written to the buffer on error. Out test code also previous passed NULL for the data_length parameter of psa_export_key() when it expected a failure (in key_policy_fail()). However, data_length is not allowed to be NULL, especially now that we write to data_length from psa_export_key() even when there are errors. Update the test code to not pass in a NULL data_length.
2018-06-27 18:20:43 +02:00
/** An invalid export length that will never be set by psa_export_key(). */
static const size_t INVALID_EXPORT_LENGTH = ~0U;
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
/** Test if a buffer contains a constant byte value.
*
* `mem_is_char(buffer, c, size)` is true after `memset(buffer, c, size)`.
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
*
* \param buffer Pointer to the beginning of the buffer.
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
* \param c Expected value of every byte.
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
* \param size Size of the buffer in bytes.
*
Simplify mem_is_nonzero to mem_is_zero This also fixes a bug that the value that mem_is_nonzero tried to return could overflow int.
2018-06-21 09:21:51 +02:00
* \return 1 if the buffer is all-bits-zero.
* \return 0 if there is at least one nonzero byte.
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
*/
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
static int mem_is_char( void *buffer, unsigned char c, size_t size )
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
{
size_t i;
for( i = 0; i < size; i++ )
{
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
if( ( (unsigned char *) buffer )[i] != c )
Simplify mem_is_nonzero to mem_is_zero This also fixes a bug that the value that mem_is_nonzero tried to return could overflow int.
2018-06-21 09:21:51 +02:00
return( 0 );
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
}
Simplify mem_is_nonzero to mem_is_zero This also fixes a bug that the value that mem_is_nonzero tried to return could overflow int.
2018-06-21 09:21:51 +02:00
return( 1 );
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
}
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
/* Write the ASN.1 INTEGER with the value 2^(bits-1)+x backwards from *p. */
static int asn1_write_10x( unsigned char **p,
unsigned char *start,
size_t bits,
unsigned char x )
{
int ret;
int len = bits / 8 + 1;
Fix argument validation in asn1_write_10x 1 << bits doesn't work when bits is too large. Found by ASan.
2018-06-28 19:04:07 +02:00
if( bits == 0 )
return( MBEDTLS_ERR_ASN1_INVALID_DATA );
if( bits <= 8 && x >= 1 << ( bits - 1 ) )
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
return( MBEDTLS_ERR_ASN1_INVALID_DATA );
Replace ssize_t by ptrdiff_t ssize_t is a POSIX thing, not standard C
2018-07-17 16:36:59 +02:00
if( *p < start || *p - start < (ptrdiff_t) len )
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
*p -= len;
( *p )[len-1] = x;
if( bits % 8 == 0 )
( *p )[1] |= 1;
else
( *p )[0] |= 1 << ( bits % 8 );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start,
MBEDTLS_ASN1_INTEGER ) );
return( len );
}
static int construct_fake_rsa_key( unsigned char *buffer,
size_t buffer_size,
unsigned char **p,
size_t bits,
int keypair )
{
size_t half_bits = ( bits + 1 ) / 2;
int ret;
int len = 0;
/* Construct something that looks like a DER encoding of
* as defined by PKCS#1 v2.2 (RFC 8017) section A.1.2:
* RSAPrivateKey ::= SEQUENCE {
* version Version,
* modulus INTEGER, -- n
* publicExponent INTEGER, -- e
* privateExponent INTEGER, -- d
* prime1 INTEGER, -- p
* prime2 INTEGER, -- q
* exponent1 INTEGER, -- d mod (p-1)
* exponent2 INTEGER, -- d mod (q-1)
* coefficient INTEGER, -- (inverse of q) mod p
* otherPrimeInfos OtherPrimeInfos OPTIONAL
* }
* Or, for a public key, the same structure with only
* version, modulus and publicExponent.
*/
*p = buffer + buffer_size;
if( keypair )
{
MBEDTLS_ASN1_CHK_ADD( len, /* pq */
asn1_write_10x( p, buffer, half_bits, 1 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* dq */
asn1_write_10x( p, buffer, half_bits, 1 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* dp */
asn1_write_10x( p, buffer, half_bits, 1 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* q */
asn1_write_10x( p, buffer, half_bits, 1 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* p != q to pass mbedtls sanity checks */
asn1_write_10x( p, buffer, half_bits, 3 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* d */
asn1_write_10x( p, buffer, bits, 1 ) );
}
MBEDTLS_ASN1_CHK_ADD( len, /* e = 65537 */
asn1_write_10x( p, buffer, 17, 1 ) );
MBEDTLS_ASN1_CHK_ADD( len, /* n */
asn1_write_10x( p, buffer, bits, 1 ) );
if( keypair )
MBEDTLS_ASN1_CHK_ADD( len, /* version = 0 */
mbedtls_asn1_write_int( p, buffer, 0 ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, buffer, len ) );
{
const unsigned char tag =
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE;
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, buffer, tag ) );
}
return( len );
}
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
static int exercise_mac_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
psa_mac_operation_t operation;
const unsigned char input[] = "foo";
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
unsigned char mac[PSA_MAC_MAX_SIZE] = {0};
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
size_t mac_length = sizeof( mac );
if( usage & PSA_KEY_USAGE_SIGN )
{
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
TEST_ASSERT( psa_mac_sign_setup( &operation,
key, alg ) == PSA_SUCCESS );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( psa_mac_update( &operation,
input, sizeof( input ) ) == PSA_SUCCESS );
Rename psa_mac_{finish,verify} -> psa_mac_{sign,verify}_finish Make function names for multipart operations more consistent (MAC finish edition).
2018-07-08 19:56:25 +02:00
TEST_ASSERT( psa_mac_sign_finish( &operation,
Fix bug in exercise_mac_key that almost always broke the SIGN case That case isn't used in the test suite yet.
2018-07-12 16:55:59 +02:00
mac, sizeof( mac ),
Rename psa_mac_{finish,verify} -> psa_mac_{sign,verify}_finish Make function names for multipart operations more consistent (MAC finish edition).
2018-07-08 19:56:25 +02:00
&mac_length ) == PSA_SUCCESS );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
}
if( usage & PSA_KEY_USAGE_VERIFY )
{
psa_status_t verify_status =
( usage & PSA_KEY_USAGE_SIGN ?
PSA_SUCCESS :
PSA_ERROR_INVALID_SIGNATURE );
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
TEST_ASSERT( psa_mac_verify_setup( &operation,
key, alg ) == PSA_SUCCESS );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( psa_mac_update( &operation,
input, sizeof( input ) ) == PSA_SUCCESS );
Rename psa_mac_{finish,verify} -> psa_mac_{sign,verify}_finish Make function names for multipart operations more consistent (MAC finish edition).
2018-07-08 19:56:25 +02:00
TEST_ASSERT( psa_mac_verify_finish( &operation,
mac,
mac_length ) == verify_status );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
}
return( 1 );
exit:
psa_mac_abort( &operation );
return( 0 );
}
static int exercise_cipher_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
psa_cipher_operation_t operation;
unsigned char iv[16] = {0};
size_t iv_length = sizeof( iv );
const unsigned char plaintext[16] = "Hello, world...";
unsigned char ciphertext[32] = "(wabblewebblewibblewobblewubble)";
size_t ciphertext_length = sizeof( ciphertext );
unsigned char decrypted[sizeof( ciphertext )];
size_t part_length;
if( usage & PSA_KEY_USAGE_ENCRYPT )
{
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_encrypt_setup( &operation,
key, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_generate_iv( &operation,
iv, sizeof( iv ),
&iv_length ) == PSA_SUCCESS );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
plaintext, sizeof( plaintext ),
ciphertext, sizeof( ciphertext ),
&ciphertext_length ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_finish( &operation,
ciphertext + ciphertext_length,
sizeof( ciphertext ) - ciphertext_length,
&part_length ) == PSA_SUCCESS );
ciphertext_length += part_length;
}
if( usage & PSA_KEY_USAGE_DECRYPT )
{
psa_status_t status;
fix PSA_BLOCK_CIPHER_BLOCK_SIZE() argument in test code
2018-06-28 10:52:54 +02:00
psa_key_type_t type = PSA_KEY_TYPE_NONE;
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) )
{
size_t bits;
TEST_ASSERT( psa_get_key_information( key, &type, &bits ) );
iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type );
}
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_decrypt_setup( &operation,
key, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_set_iv( &operation,
iv, iv_length ) == PSA_SUCCESS );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
ciphertext, ciphertext_length,
decrypted, sizeof( decrypted ),
&part_length ) == PSA_SUCCESS );
status = psa_cipher_finish( &operation,
decrypted + part_length,
sizeof( decrypted ) - part_length,
&part_length );
/* For a stream cipher, all inputs are valid. For a block cipher,
* if the input is some aribtrary data rather than an actual
ciphertext, a padding error is likely. */
fix if condition to validate encrypt key usage
2018-06-28 11:14:00 +02:00
if( ( usage & PSA_KEY_USAGE_ENCRYPT ) ||
fix PSA_BLOCK_CIPHER_BLOCK_SIZE() argument in test code
2018-06-28 10:52:54 +02:00
PSA_BLOCK_CIPHER_BLOCK_SIZE( type ) == 1 )
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_SUCCESS ||
status == PSA_ERROR_INVALID_PADDING );
}
return( 1 );
exit:
psa_cipher_abort( &operation );
return( 0 );
}
static int exercise_aead_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
unsigned char nonce[16] = {0};
size_t nonce_length = sizeof( nonce );
unsigned char plaintext[16] = "Hello, world...";
unsigned char ciphertext[48] = "(wabblewebblewibblewobblewubble)";
size_t ciphertext_length = sizeof( ciphertext );
size_t plaintext_length = sizeof( ciphertext );
if( usage & PSA_KEY_USAGE_ENCRYPT )
{
TEST_ASSERT( psa_aead_encrypt( key, alg,
nonce, nonce_length,
NULL, 0,
plaintext, sizeof( plaintext ),
ciphertext, sizeof( ciphertext ),
&ciphertext_length ) == PSA_SUCCESS );
}
if( usage & PSA_KEY_USAGE_DECRYPT )
{
psa_status_t verify_status =
( usage & PSA_KEY_USAGE_ENCRYPT ?
PSA_SUCCESS :
PSA_ERROR_INVALID_SIGNATURE );
TEST_ASSERT( psa_aead_decrypt( key, alg,
nonce, nonce_length,
NULL, 0,
ciphertext, ciphertext_length,
plaintext, sizeof( plaintext ),
&plaintext_length ) == verify_status );
}
return( 1 );
exit:
return( 0 );
}
static int exercise_signature_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
Change a generate_key test to exercise with PSS This required tweaking exercise_signature_key to use a payload size for the signature based on the algorithm, since our implementation of PSS requires that the input size matches the hash size. This would also be the case for PKCS#1 v1.5 with a specified hash.
2018-06-30 00:20:25 +02:00
unsigned char payload[PSA_HASH_MAX_SIZE] = {1};
size_t payload_length = 16;
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
unsigned char signature[PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE] = {0};
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
size_t signature_length = sizeof( signature );
if( usage & PSA_KEY_USAGE_SIGN )
{
Change a generate_key test to exercise with PSS This required tweaking exercise_signature_key to use a payload size for the signature based on the algorithm, since our implementation of PSS requires that the input size matches the hash size. This would also be the case for PKCS#1 v1.5 with a specified hash.
2018-06-30 00:20:25 +02:00
/* Some algorithms require the payload to have the size of
* the hash encoded in the algorithm. Use this input size
* even for algorithms that allow other input sizes. */
psa_algorithm_t hash_alg = PSA_ALG_SIGN_GET_HASH( alg );
if( hash_alg != 0 )
payload_length = PSA_HASH_SIZE( hash_alg );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
TEST_ASSERT( psa_asymmetric_sign( key, alg,
payload, payload_length,
signature, sizeof( signature ),
&signature_length ) == PSA_SUCCESS );
}
if( usage & PSA_KEY_USAGE_VERIFY )
{
psa_status_t verify_status =
( usage & PSA_KEY_USAGE_SIGN ?
PSA_SUCCESS :
PSA_ERROR_INVALID_SIGNATURE );
TEST_ASSERT( psa_asymmetric_verify( key, alg,
payload, payload_length,
signature, signature_length ) ==
verify_status );
}
return( 1 );
exit:
return( 0 );
}
static int exercise_asymmetric_encryption_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
unsigned char plaintext[256] = "Hello, world...";
unsigned char ciphertext[256] = "(wabblewebblewibblewobblewubble)";
size_t ciphertext_length = sizeof( ciphertext );
size_t plaintext_length = 16;
if( usage & PSA_KEY_USAGE_ENCRYPT )
{
TEST_ASSERT(
psa_asymmetric_encrypt( key, alg,
plaintext, plaintext_length,
NULL, 0,
ciphertext, sizeof( ciphertext ),
&ciphertext_length ) == PSA_SUCCESS );
}
if( usage & PSA_KEY_USAGE_DECRYPT )
{
psa_status_t status =
psa_asymmetric_decrypt( key, alg,
ciphertext, ciphertext_length,
NULL, 0,
plaintext, sizeof( plaintext ),
&plaintext_length );
TEST_ASSERT( status == PSA_SUCCESS ||
( ( usage & PSA_KEY_USAGE_ENCRYPT ) == 0 &&
( status == PSA_ERROR_INVALID_ARGUMENT ||
status == PSA_ERROR_INVALID_PADDING ) ) );
}
return( 1 );
exit:
return( 0 );
}
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
Add framework for simple key derivation New key type PSA_KEY_TYPE_DERIVE. New usage flag PSA_KEY_USAGE_DERIVE. New function psa_key_derivation. No key derivation algorithm is implemented yet. The code may not compile with -Wunused. Write some unit test code for psa_key_derivation. Most of it cannot be used yet due to the lack of a key derivation algorithm.
2018-07-12 17:17:20 +02:00
static int exercise_key_derivation_key( psa_key_slot_t key,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
unsigned char label[16] = "This is a label.";
size_t label_length = sizeof( label );
unsigned char seed[16] = "abcdefghijklmnop";
size_t seed_length = sizeof( seed );
unsigned char output[1];
if( usage & PSA_KEY_USAGE_DERIVE )
{
TEST_ASSERT( psa_key_derivation( &generator,
key, alg,
label, label_length,
seed, seed_length,
sizeof( output ) ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_read( &generator,
output,
sizeof( output ) ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_abort( &generator ) == PSA_SUCCESS );
}
return( 1 );
exit:
return( 0 );
}
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
static int is_oid_of_key_type( psa_key_type_t type,
const uint8_t *oid, size_t oid_length )
{
Avoid non-standard C constructs Don't rely on static initialization of a flexible array member, that's a GNU extension. The previous code also triggered a Clang warning "suggest braces around initialization of subobject" (-Wmissing-braces) for `struct {char a[]} = {"foo"}`.
2018-08-13 14:14:22 +02:00
const uint8_t *expected_oid = NULL;
size_t expected_oid_length = 0;
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
#if defined(MBEDTLS_RSA_C)
Avoid non-standard C constructs Don't rely on static initialization of a flexible array member, that's a GNU extension. The previous code also triggered a Clang warning "suggest braces around initialization of subobject" (-Wmissing-braces) for `struct {char a[]} = {"foo"}`.
2018-08-13 14:14:22 +02:00
if( PSA_KEY_TYPE_IS_RSA( type ) )
{
expected_oid = (uint8_t *) MBEDTLS_OID_PKCS1_RSA;
expected_oid_length = sizeof( MBEDTLS_OID_PKCS1_RSA ) - 1;
}
else
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
#endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_ECP_C)
Avoid non-standard C constructs Don't rely on static initialization of a flexible array member, that's a GNU extension. The previous code also triggered a Clang warning "suggest braces around initialization of subobject" (-Wmissing-braces) for `struct {char a[]} = {"foo"}`.
2018-08-13 14:14:22 +02:00
if( PSA_KEY_TYPE_IS_ECC( type ) )
{
expected_oid = (uint8_t *) MBEDTLS_OID_EC_ALG_UNRESTRICTED;
expected_oid_length = sizeof( MBEDTLS_OID_EC_ALG_UNRESTRICTED ) - 1;
}
else
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
#endif /* MBEDTLS_ECP_C */
{
char message[40];
mbedtls_snprintf( message, sizeof( message ),
"OID not known for key type=0x%08lx",
(unsigned long) type );
test_fail( message, __LINE__, __FILE__ );
return( 0 );
}
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_oid, expected_oid_length, oid, oid_length );
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
return( 1 );
exit:
return( 0 );
}
static int asn1_skip_integer( unsigned char **p, const unsigned char *end,
size_t min_bits, size_t max_bits,
int must_be_odd )
{
size_t len;
size_t actual_bits;
unsigned char msb;
TEST_ASSERT( mbedtls_asn1_get_tag( p, end, &len,
MBEDTLS_ASN1_INTEGER ) == 0 );
/* Tolerate a slight departure from DER encoding:
* - 0 may be represented by an empty string or a 1-byte string.
* - The sign bit may be used as a value bit. */
if( ( len == 1 && ( *p )[0] == 0 ) ||
( len > 1 && ( *p )[0] == 0 && ( ( *p )[1] & 0x80 ) != 0 ) )
{
++( *p );
--len;
}
if( min_bits == 0 && len == 0 )
return( 1 );
msb = ( *p )[0];
TEST_ASSERT( msb != 0 );
actual_bits = 8 * ( len - 1 );
while( msb != 0 )
{
msb >>= 1;
++actual_bits;
}
TEST_ASSERT( actual_bits >= min_bits );
TEST_ASSERT( actual_bits <= max_bits );
if( must_be_odd )
TEST_ASSERT( ( ( *p )[len-1] & 1 ) != 0 );
*p += len;
return( 1 );
exit:
return( 0 );
}
static int asn1_get_implicit_tag( unsigned char **p, const unsigned char *end,
size_t *len,
unsigned char n, unsigned char tag )
{
int ret;
ret = mbedtls_asn1_get_tag( p, end, len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC |
MBEDTLS_ASN1_CONSTRUCTED | ( n ) );
if( ret != 0 )
return( ret );
end = *p + *len;
ret = mbedtls_asn1_get_tag( p, end, len, tag );
if( ret != 0 )
return( ret );
if( *p + *len != end )
return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
return( 0 );
}
static int exported_key_sanity_check( psa_key_type_t type, size_t bits,
uint8_t *exported, size_t exported_length )
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
{
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
if( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) )
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
TEST_ASSERT( exported_length == ( bits + 7 ) / 8 );
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
else
TEST_ASSERT( exported_length <= PSA_KEY_EXPORT_MAX_SIZE( type, bits ) );
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
#if defined(MBEDTLS_DES_C)
if( type == PSA_KEY_TYPE_DES )
{
/* Check the parity bits. */
unsigned i;
for( i = 0; i < bits / 8; i++ )
{
unsigned bit_count = 0;
unsigned m;
for( m = 1; m <= 0x100; m <<= 1 )
{
if( exported[i] & m )
++bit_count;
}
TEST_ASSERT( bit_count % 2 != 0 );
}
}
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
else
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
#endif
#if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_PARSE_C)
if( type == PSA_KEY_TYPE_RSA_KEYPAIR )
{
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
uint8_t *p = exported;
uint8_t *end = exported + exported_length;
size_t len;
/* RSAPrivateKey ::= SEQUENCE {
Clarify comment in test In RSAPrivateKey, Version is an INTEGER. The version must be 0.
2018-08-21 16:12:54 +02:00
* version INTEGER, -- must be 0
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
* modulus INTEGER, -- n
* publicExponent INTEGER, -- e
* privateExponent INTEGER, -- d
* prime1 INTEGER, -- p
* prime2 INTEGER, -- q
* exponent1 INTEGER, -- d mod (p-1)
* exponent2 INTEGER, -- d mod (q-1)
* coefficient INTEGER, -- (inverse of q) mod p
* }
*/
TEST_ASSERT( mbedtls_asn1_get_tag( &p, end, &len,
MBEDTLS_ASN1_SEQUENCE |
MBEDTLS_ASN1_CONSTRUCTED ) == 0 );
TEST_ASSERT( p + len == end );
if( ! asn1_skip_integer( &p, end, 0, 0, 0 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, bits, bits, 1 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, 2, bits, 1 ) )
goto exit;
/* Require d to be at least half the size of n. */
if( ! asn1_skip_integer( &p, end, bits / 2, bits, 1 ) )
goto exit;
/* Require p and q to be at most half the size of n, rounded up. */
if( ! asn1_skip_integer( &p, end, bits / 2, bits / 2 + 1, 1 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, bits / 2, bits / 2 + 1, 1 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, 1, bits / 2 + 1, 0 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, 1, bits / 2 + 1, 0 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, 1, bits / 2 + 1, 0 ) )
goto exit;
TEST_ASSERT( p == end );
}
else
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
#endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_ECP_C)
if( PSA_KEY_TYPE_IS_ECC_KEYPAIR( type ) )
{
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
uint8_t *p = exported;
uint8_t *end = exported + exported_length;
size_t len;
int version;
/* ECPrivateKey ::= SEQUENCE {
* version INTEGER, -- must be 1
* privateKey OCTET STRING,
* -- `ceiling(log_{256}(n))`-byte string, big endian,
* -- where n is the order of the curve.
* parameters ECParameters {{ NamedCurve }}, -- mandatory
* publicKey BIT STRING -- mandatory
* }
*/
TEST_ASSERT( mbedtls_asn1_get_tag( &p, end, &len,
MBEDTLS_ASN1_SEQUENCE |
MBEDTLS_ASN1_CONSTRUCTED ) == 0 );
TEST_ASSERT( p + len == end );
TEST_ASSERT( mbedtls_asn1_get_int( &p, end, &version ) == 0 );
TEST_ASSERT( version == 1 );
TEST_ASSERT( mbedtls_asn1_get_tag( &p, end, &len,
MBEDTLS_ASN1_OCTET_STRING ) == 0 );
/* Bug in Mbed TLS: the length of the octet string depends on the value */
// TEST_ASSERT( len == PSA_BITS_TO_BYTES( bits ) );
p += len;
TEST_ASSERT( asn1_get_implicit_tag( &p, end, &len, 0,
MBEDTLS_ASN1_OID ) == 0 );
p += len;
Minor documentation improvements
2018-08-13 17:24:59 +02:00
/* publicKey: ECPoint in uncompressed representation (as below) */
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
TEST_ASSERT( asn1_get_implicit_tag( &p, end, &len, 1,
MBEDTLS_ASN1_BIT_STRING ) == 0 );
TEST_ASSERT( p + len == end );
TEST_ASSERT( p[0] == 0 ); /* 0 unused bits in the bit string */
++p;
TEST_ASSERT( p + 1 + 2 * PSA_BITS_TO_BYTES( bits ) == end );
TEST_ASSERT( p[0] == 4 );
}
else
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
#endif /* MBEDTLS_ECP_C */
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
if( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) )
{
uint8_t *p = exported;
uint8_t *end = exported + exported_length;
size_t len;
mbedtls_asn1_buf alg;
mbedtls_asn1_buf params;
mbedtls_asn1_bitstring bitstring;
/* SubjectPublicKeyInfo ::= SEQUENCE {
* algorithm AlgorithmIdentifier,
* subjectPublicKey BIT STRING }
* AlgorithmIdentifier ::= SEQUENCE {
* algorithm OBJECT IDENTIFIER,
* parameters ANY DEFINED BY algorithm OPTIONAL }
*/
TEST_ASSERT( mbedtls_asn1_get_tag( &p, end, &len,
MBEDTLS_ASN1_SEQUENCE |
MBEDTLS_ASN1_CONSTRUCTED ) == 0 );
TEST_ASSERT( p + len == end );
TEST_ASSERT( mbedtls_asn1_get_alg( &p, end, &alg, &params ) == 0 );
if( ! is_oid_of_key_type( type, alg.p, alg.len ) )
goto exit;
TEST_ASSERT( mbedtls_asn1_get_bitstring( &p, end, &bitstring ) == 0 );
TEST_ASSERT( p == end );
p = bitstring.p;
#if defined(MBEDTLS_RSA_C)
if( type == PSA_KEY_TYPE_RSA_PUBLIC_KEY )
{
/* RSAPublicKey ::= SEQUENCE {
* modulus INTEGER, -- n
* publicExponent INTEGER } -- e
*/
TEST_ASSERT( bitstring.unused_bits == 0 );
TEST_ASSERT( mbedtls_asn1_get_tag( &p, end, &len,
MBEDTLS_ASN1_SEQUENCE |
MBEDTLS_ASN1_CONSTRUCTED ) == 0 );
TEST_ASSERT( p + len == end );
if( ! asn1_skip_integer( &p, end, bits, bits, 1 ) )
goto exit;
if( ! asn1_skip_integer( &p, end, 2, bits, 1 ) )
goto exit;
TEST_ASSERT( p == end );
}
else
#endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_ECP_C)
if( PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY( type ) )
{
/* ECPoint ::= ...
Minor documentation improvements
2018-08-13 17:24:59 +02:00
* -- first 8 bits: 0x04 (uncompressed representation);
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
* -- then x_P as an n-bit string, big endian;
* -- then y_P as a n-bit string, big endian,
* -- where n is the order of the curve.
*/
TEST_ASSERT( bitstring.unused_bits == 0 );
TEST_ASSERT( p + 1 + 2 * PSA_BITS_TO_BYTES( bits ) == end );
TEST_ASSERT( p[0] == 4 );
}
else
#endif /* MBEDTLS_ECP_C */
{
char message[40];
mbedtls_snprintf( message, sizeof( message ),
"No sanity check for public key type=0x%08lx",
(unsigned long) type );
test_fail( message, __LINE__, __FILE__ );
return( 0 );
}
}
else
{
/* No sanity checks for other types */
}
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
return( 1 );
Improve and augment export sanity checks Implement sanity checks of exported public keys, using ASN.1 parsing. Rewrite the sanity checks of key pairs using ASN.1 parsing, so as to check more things with simpler code.
2018-08-11 01:22:42 +02:00
exit:
return( 0 );
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
}
static int exercise_export_key( psa_key_slot_t slot,
psa_key_usage_t usage )
{
psa_key_type_t type;
size_t bits;
uint8_t *exported = NULL;
size_t exported_size = 0;
size_t exported_length = 0;
int ok = 0;
exercise_export_key: fix public key case Public keys are always exportable, even if their usage doesn't include the EXPORT flag.
2018-09-13 20:34:11 +02:00
TEST_ASSERT( psa_get_key_information( slot, &type, &bits ) == PSA_SUCCESS );
if( ( usage & PSA_KEY_USAGE_EXPORT ) == 0 &&
! PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) )
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
{
TEST_ASSERT( psa_export_key( slot, NULL, 0, &exported_length ) ==
PSA_ERROR_NOT_PERMITTED );
return( 1 );
}
exported_size = PSA_KEY_EXPORT_MAX_SIZE( type, bits );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( exported, exported_size );
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
TEST_ASSERT( psa_export_key( slot,
exported, exported_size,
&exported_length ) == PSA_SUCCESS );
ok = exported_key_sanity_check( type, bits, exported, exported_length );
exit:
mbedtls_free( exported );
return( ok );
}
static int exercise_export_public_key( psa_key_slot_t slot )
{
psa_key_type_t type;
psa_key_type_t public_type;
size_t bits;
uint8_t *exported = NULL;
size_t exported_size = 0;
size_t exported_length = 0;
int ok = 0;
TEST_ASSERT( psa_get_key_information( slot, &type, &bits ) == PSA_SUCCESS );
if( ! PSA_KEY_TYPE_IS_ASYMMETRIC( type ) )
{
TEST_ASSERT( psa_export_public_key( slot,
NULL, 0, &exported_length ) ==
PSA_ERROR_INVALID_ARGUMENT );
return( 1 );
}
public_type = PSA_KEY_TYPE_PUBLIC_KEY_OF_KEYPAIR( type );
exported_size = PSA_KEY_EXPORT_MAX_SIZE( public_type, bits );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( exported, exported_size );
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
TEST_ASSERT( psa_export_public_key( slot,
exported, exported_size,
&exported_length ) == PSA_SUCCESS );
ok = exported_key_sanity_check( public_type, bits,
exported, exported_length );
exit:
mbedtls_free( exported );
return( ok );
}
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
static int exercise_key( psa_key_slot_t slot,
psa_key_usage_t usage,
psa_algorithm_t alg )
{
int ok;
if( alg == 0 )
ok = 1; /* If no algorihm, do nothing (used for raw data "keys"). */
else if( PSA_ALG_IS_MAC( alg ) )
ok = exercise_mac_key( slot, usage, alg );
else if( PSA_ALG_IS_CIPHER( alg ) )
ok = exercise_cipher_key( slot, usage, alg );
else if( PSA_ALG_IS_AEAD( alg ) )
ok = exercise_aead_key( slot, usage, alg );
else if( PSA_ALG_IS_SIGN( alg ) )
ok = exercise_signature_key( slot, usage, alg );
else if( PSA_ALG_IS_ASYMMETRIC_ENCRYPTION( alg ) )
ok = exercise_asymmetric_encryption_key( slot, usage, alg );
Add framework for simple key derivation New key type PSA_KEY_TYPE_DERIVE. New usage flag PSA_KEY_USAGE_DERIVE. New function psa_key_derivation. No key derivation algorithm is implemented yet. The code may not compile with -Wunused. Write some unit test code for psa_key_derivation. Most of it cannot be used yet due to the lack of a key derivation algorithm.
2018-07-12 17:17:20 +02:00
else if( PSA_ALG_IS_KEY_DERIVATION( alg ) )
ok = exercise_key_derivation_key( slot, usage, alg );
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
else
{
char message[40];
mbedtls_snprintf( message, sizeof( message ),
"No code to exercise alg=0x%08lx",
(unsigned long) alg );
test_fail( message, __LINE__, __FILE__ );
ok = 0;
}
Move export key sanity check from generate to exercise Move the code to perform sanity checks on the exported key from generate_key to exercise_key. This way the sanity checks can be performed after importing or deriving a key as well. In addition to checking the exported key if its usage allows it, check the exported public key if the key is asymmetric.
2018-08-10 19:07:32 +02:00
ok = ok && exercise_export_key( slot, usage );
ok = ok && exercise_export_public_key( slot );
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
return( ok );
}
Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
/* END_HEADER */
/* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_PSA_CRYPTO_C
* END_DEPENDENCIES
*/
/* BEGIN_CASE */
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
void init_deinit( )
Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
{
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
psa_status_t status;
Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
int i;
for( i = 0; i <= 1; i++ )
{
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
status = psa_crypto_init( );
TEST_ASSERT( status == PSA_SUCCESS );
status = psa_crypto_init( );
TEST_ASSERT( status == PSA_SUCCESS );
Add PSA crypto module New module psa_crypto.c (MBEDTLS_PSA_CRYPTO_C): Platform Security Architecture compatibility layer on top of libmedcrypto. Implement psa_crypto_init function which sets up a RNG. Add a mbedtls_psa_crypto_free function which deinitializes the library. Define a first batch of error codes.
2018-01-27 23:32:46 +01:00
mbedtls_psa_crypto_free( );
}
}
/* END_CASE */
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
Fix buffer overflow in the slot array Slots are numbered from 1, but the slot array is a C array so it's numbered from 0. Add a non-regression test.
2018-08-01 15:45:45 +02:00
/* BEGIN_CASE */
void fill_slots( int max_arg )
{
/* Fill all the slots until we run out of memory or out of slots,
* or until some limit specified in the test data for the sake of
* implementations with an essentially unlimited number of slots.
* This test assumes that available slots are numbered from 1. */
psa_key_slot_t slot;
psa_key_slot_t max = 0;
psa_key_policy_t policy;
uint8_t exported[sizeof( max )];
size_t exported_size;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT, 0 );
for( max = 1; max <= (size_t) max_arg; max++ )
{
status = psa_set_key_policy( max, &policy );
/* Stop filling slots if we run out of memory or out of
* available slots. */
TEST_ASSERT( status == PSA_SUCCESS ||
status == PSA_ERROR_INSUFFICIENT_MEMORY ||
status == PSA_ERROR_INVALID_ARGUMENT );
if( status != PSA_SUCCESS )
break;
status = psa_import_key( max, PSA_KEY_TYPE_RAW_DATA,
(uint8_t*) &max, sizeof( max ) );
/* Since psa_set_key_policy succeeded, we know that the slot
* number is valid. But we may legitimately run out of memory. */
TEST_ASSERT( status == PSA_SUCCESS ||
status == PSA_ERROR_INSUFFICIENT_MEMORY );
if( status != PSA_SUCCESS )
break;
}
/* `max` is now the first slot number that wasn't filled. */
max -= 1;
for( slot = 1; slot <= max; slot++ )
{
TEST_ASSERT( psa_export_key( slot,
exported, sizeof( exported ),
&exported_size ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( &slot, sizeof( slot ), exported, exported_size );
Fix buffer overflow in the slot array Slots are numbered from 1, but the slot array is a C array so it's numbered from 0. Add a non-regression test.
2018-08-01 15:45:45 +02:00
}
exit:
psa_crypto_free: destroy the last slot The last slot in the array was not freed due to an off-by-one error. Amend the fill_slots test to serve as a non-regression test for this issue: without this bug fix, it would cause a memory leak.
2018-08-01 15:46:54 +02:00
/* Do not destroy the keys. mbedtls_psa_crypto_free() should do it. */
Fix buffer overflow in the slot array Slots are numbered from 1, but the slot array is a C array so it's numbered from 0. Add a non-regression test.
2018-08-01 15:45:45 +02:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
/* BEGIN_CASE */
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
void import( data_t *data, int type, int expected_status_arg )
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
{
int slot = 1;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
psa_status_t status;
TEST_ASSERT( data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( data->len ) );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
status = psa_import_key( slot, type, data->x, data->len );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
if( status == PSA_SUCCESS )
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
exit:
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
/* BEGIN_CASE */
void import_rsa_made_up( int bits_arg, int keypair, int expected_status_arg )
{
int slot = 1;
size_t bits = bits_arg;
psa_status_t expected_status = expected_status_arg;
psa_status_t status;
psa_key_type_t type =
keypair ? PSA_KEY_TYPE_RSA_KEYPAIR : PSA_KEY_TYPE_RSA_PUBLIC_KEY;
size_t buffer_size = /* Slight overapproximations */
keypair ? bits * 9 / 16 + 80 : bits / 8 + 20;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
unsigned char *buffer = NULL;
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
unsigned char *p;
int ret;
size_t length;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( buffer, buffer_size );
Test that creating RSA keys larger than the maximum fails Test keypair import, public key import and key generation.
2018-06-28 00:16:11 +02:00
TEST_ASSERT( ( ret = construct_fake_rsa_key( buffer, buffer_size, &p,
bits, keypair ) ) >= 0 );
length = ret;
/* Try importing the key */
status = psa_import_key( slot, type, p, length );
TEST_ASSERT( status == expected_status );
if( status == PSA_SUCCESS )
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
exit:
mbedtls_free( buffer );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void import_export( data_t *data,
add non-regression tests for export public/non public key
2018-06-04 17:42:36 +02:00
int type_arg,
int alg_arg,
int usage_arg,
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
int expected_bits,
int export_size_delta,
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
int expected_export_status_arg,
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
int canonical_input )
{
int slot = 1;
int slot2 = slot + 1;
psa_key_type_t type = type_arg;
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_export_status = expected_export_status_arg;
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
psa_status_t status;
unsigned char *exported = NULL;
unsigned char *reexported = NULL;
size_t export_size;
psa_export_key: Always set a valid data length Make psa_export_key() always set a valid data_length when exporting, even when there are errors. This makes the API easier to use for buggy programs (like our test code). Our test code previously used exported_length uninitialized when checking to see that the buffer returned was all zero in import_export() in the case where an error was returned from psa_export_key(). Initialize exported_length to an invalid length, and check that it gets set properly by psa_export_key(), to avoid this using export_length uninitialized. Note that the mem_is_zero() check is still valid when psa_export_key() returns an error, e.g. where exported_length is 0, as we want to check that nothing was written to the buffer on error. Out test code also previous passed NULL for the data_length parameter of psa_export_key() when it expected a failure (in key_policy_fail()). However, data_length is not allowed to be NULL, especially now that we write to data_length from psa_export_key() even when there are errors. Update the test code to not pass in a NULL data_length.
2018-06-27 18:20:43 +02:00
size_t exported_length = INVALID_EXPORT_LENGTH;
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
size_t reexported_length;
psa_key_type_t got_type;
size_t got_bits;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( data->len ) );
Replace ssize_t by ptrdiff_t ssize_t is a POSIX thing, not standard C
2018-07-17 16:36:59 +02:00
export_size = (ptrdiff_t) data->len + export_size_delta;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( exported, export_size );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
if( ! canonical_input )
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( reexported, export_size );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, usage_arg, alg );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
/* Import the key */
TEST_ASSERT( psa_import_key( slot, type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
data->x, data->len ) == PSA_SUCCESS );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
/* Test the key information */
TEST_ASSERT( psa_get_key_information( slot,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
&got_type,
&got_bits ) == PSA_SUCCESS );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( got_type == type );
TEST_ASSERT( got_bits == (size_t) expected_bits );
/* Export the key */
status = psa_export_key( slot,
exported, export_size,
&exported_length );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_export_status );
psa_export_key: Always set a valid data length Make psa_export_key() always set a valid data_length when exporting, even when there are errors. This makes the API easier to use for buggy programs (like our test code). Our test code previously used exported_length uninitialized when checking to see that the buffer returned was all zero in import_export() in the case where an error was returned from psa_export_key(). Initialize exported_length to an invalid length, and check that it gets set properly by psa_export_key(), to avoid this using export_length uninitialized. Note that the mem_is_zero() check is still valid when psa_export_key() returns an error, e.g. where exported_length is 0, as we want to check that nothing was written to the buffer on error. Out test code also previous passed NULL for the data_length parameter of psa_export_key() when it expected a failure (in key_policy_fail()). However, data_length is not allowed to be NULL, especially now that we write to data_length from psa_export_key() even when there are errors. Update the test code to not pass in a NULL data_length.
2018-06-27 18:20:43 +02:00
/* The exported length must be set by psa_export_key() to a value between 0
* and export_size. On errors, the exported length must be 0. */
TEST_ASSERT( exported_length != INVALID_EXPORT_LENGTH );
TEST_ASSERT( status == PSA_SUCCESS || exported_length == 0 );
TEST_ASSERT( exported_length <= export_size );
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
TEST_ASSERT( mem_is_char( exported + exported_length, 0,
Simplify mem_is_nonzero to mem_is_zero This also fixes a bug that the value that mem_is_nonzero tried to return could overflow int.
2018-06-21 09:21:51 +02:00
export_size - exported_length ) );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
if( status != PSA_SUCCESS )
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
{
TEST_ASSERT( exported_length == 0 );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
goto destroy;
psa_export_key: zero out potential garbage in the output buffer In psa_export_key, ensure that each byte of the output buffer either contains its original value, is zero, or is part of the actual output. Specifically, don't risk having partial output on error, and don't leave extra data at the end of the buffer when exporting an asymmetric key. Test that exporting to a previously zeroed buffer leaves the buffer zeroed outside the actual output if any.
2018-06-20 00:11:45 +02:00
}
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
Do export sanity checks in import_export as well This is not useful to validate the implementation when importing canonical input, which is the case for most import/export test cases, but it helps validate the sanity checks themselves.
2018-08-11 01:24:55 +02:00
if( ! exercise_export_key( slot, usage_arg ) )
goto exit;
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
if( canonical_input )
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( data->x, data->len, exported, exported_length );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
else
{
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
TEST_ASSERT( psa_set_key_policy( slot2, &policy ) == PSA_SUCCESS );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( psa_import_key( slot2, type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
exported,
Fix re-import size in import_export test with non-canonical input
2018-08-07 15:33:10 +02:00
exported_length ) == PSA_SUCCESS );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
TEST_ASSERT( psa_export_key( slot2,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
reexported,
export_size,
&reexported_length ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( exported, exported_length,
reexported, reexported_length );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
}
destroy:
/* Destroy the key */
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_information(
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( exported );
mbedtls_free( reexported );
Add key management functions Define psa_key_type_t and a first stab at a few values. New functions psa_import_key, psa_export_key, psa_destroy_key, psa_get_key_information. Implement them for raw data and RSA. Under the hood, create an in-memory, fixed-size keystore with room for MBEDTLS_PSA_KEY_SLOT_COUNT - 1 keys.
2018-01-28 13:16:24 +01:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void import_export_public_key( data_t *data,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
int type_arg,
int alg_arg,
int expected_bits,
int public_key_expected_length,
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
int expected_export_status_arg )
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
{
int slot = 1;
psa_key_type_t type = type_arg;
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_export_status = expected_export_status_arg;
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
psa_status_t status;
unsigned char *exported = NULL;
size_t export_size;
psa: export_public_key: Check for all zero on error
2018-06-27 18:47:40 +02:00
size_t exported_length = INVALID_EXPORT_LENGTH;
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
psa_key_type_t got_type;
size_t got_bits;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
TEST_ASSERT( data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( data->len ) );
Replace ssize_t by ptrdiff_t ssize_t is a POSIX thing, not standard C
2018-07-17 16:36:59 +02:00
export_size = (ptrdiff_t) data->len;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( exported, export_size );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT, alg );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
/* Import the key */
TEST_ASSERT( psa_import_key( slot, type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
data->x, data->len ) == PSA_SUCCESS );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
/* Test the key information */
TEST_ASSERT( psa_get_key_information( slot,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
&got_type,
&got_bits ) == PSA_SUCCESS );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
TEST_ASSERT( got_type == type );
TEST_ASSERT( got_bits == (size_t) expected_bits );
/* Export the key */
status = psa_export_public_key( slot,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
exported, export_size,
&exported_length );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_export_status );
psa: export_public_key: Check for all zero on error
2018-06-27 18:47:40 +02:00
TEST_ASSERT( exported_length == (size_t) public_key_expected_length );
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
TEST_ASSERT( mem_is_char( exported + exported_length, 0,
psa: export_public_key: Check for all zero on error
2018-06-27 18:47:40 +02:00
export_size - exported_length ) );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
if( status != PSA_SUCCESS )
goto destroy;
destroy:
/* Destroy the key */
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_information(
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( exported );
move import_export_public_key func place
2018-06-06 16:26:04 +02:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Add import-and-exercise tests for some signature algorithms
2018-06-26 16:12:43 +02:00
/* BEGIN_CASE */
void import_and_exercise_key( data_t *data,
int type_arg,
int bits_arg,
int alg_arg )
{
int slot = 1;
psa_key_type_t type = type_arg;
size_t bits = bits_arg;
psa_algorithm_t alg = alg_arg;
psa_key_usage_t usage =
( PSA_ALG_IS_MAC( alg ) || PSA_ALG_IS_SIGN( alg ) ?
( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ?
PSA_KEY_USAGE_VERIFY :
PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY ) :
PSA_ALG_IS_CIPHER( alg ) || PSA_ALG_IS_AEAD( alg ) ||
PSA_ALG_IS_ASYMMETRIC_ENCRYPTION( alg ) ?
( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ?
PSA_KEY_USAGE_ENCRYPT :
PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT ) :
Add framework for simple key derivation New key type PSA_KEY_TYPE_DERIVE. New usage flag PSA_KEY_USAGE_DERIVE. New function psa_key_derivation. No key derivation algorithm is implemented yet. The code may not compile with -Wunused. Write some unit test code for psa_key_derivation. Most of it cannot be used yet due to the lack of a key derivation algorithm.
2018-07-12 17:17:20 +02:00
PSA_ALG_IS_KEY_DERIVATION( alg ) ? PSA_KEY_USAGE_DERIVE :
Add import-and-exercise tests for some signature algorithms
2018-06-26 16:12:43 +02:00
0 );
psa_key_policy_t policy;
psa_key_type_t got_type;
size_t got_bits;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, usage, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
/* Import the key */
status = psa_import_key( slot, type, data->x, data->len );
TEST_ASSERT( status == PSA_SUCCESS );
/* Test the key information */
TEST_ASSERT( psa_get_key_information( slot,
&got_type,
&got_bits ) == PSA_SUCCESS );
TEST_ASSERT( got_type == type );
TEST_ASSERT( got_bits == bits );
/* Do something with the key according to its type and permitted usage. */
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
if( ! exercise_key( slot, usage, alg ) )
goto exit;
Add import-and-exercise tests for some signature algorithms
2018-06-26 16:12:43 +02:00
exit:
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
/* BEGIN_CASE */
void key_policy( int usage_arg, int alg_arg )
{
int key_slot = 1;
psa_algorithm_t alg = alg_arg;
psa_key_usage_t usage = usage_arg;
psa_key_type_t key_type = PSA_KEY_TYPE_AES;
unsigned char key[32] = {0};
psa_key_policy_t policy_set;
psa_key_policy_t policy_get;
memset( key, 0x2a, sizeof( key ) );
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy_set );
psa_key_policy_init( &policy_get );
psa_key_policy_set_usage( &policy_set, usage, alg );
TEST_ASSERT( psa_key_policy_get_usage( &policy_set ) == usage );
TEST_ASSERT( psa_key_policy_get_algorithm( &policy_set ) == alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy_set ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key, sizeof( key ) ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_policy( key_slot, &policy_get ) == PSA_SUCCESS );
TEST_ASSERT( policy_get.usage == policy_set.usage );
TEST_ASSERT( policy_get.alg == policy_set.alg );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
void mac_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int exercise_alg )
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
{
int key_slot = 1;
psa_key_policy_t policy;
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
psa_mac_operation_t operation;
psa_status_t status;
unsigned char mac[PSA_MAC_MAX_SIZE];
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
status = psa_mac_sign_setup( &operation, key_slot, exercise_alg );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_SIGN ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
psa_mac_abort( &operation );
memset( mac, 0, sizeof( mac ) );
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
status = psa_mac_verify_setup( &operation, key_slot, exercise_alg );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_VERIFY ) != 0 )
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
TEST_ASSERT( status == PSA_SUCCESS );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
exit:
psa_mac_abort( &operation );
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void cipher_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int exercise_alg )
{
int key_slot = 1;
psa_key_policy_t policy;
psa_cipher_operation_t operation;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
status = psa_cipher_encrypt_setup( &operation, key_slot, exercise_alg );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_ENCRYPT ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
psa_cipher_abort( &operation );
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
status = psa_cipher_decrypt_setup( &operation, key_slot, exercise_alg );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_DECRYPT ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
exit:
psa_cipher_abort( &operation );
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void aead_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int nonce_length_arg,
int tag_length_arg,
int exercise_alg )
{
int key_slot = 1;
psa_key_policy_t policy;
psa_status_t status;
unsigned char nonce[16] = {0};
size_t nonce_length = nonce_length_arg;
unsigned char tag[16];
size_t tag_length = tag_length_arg;
size_t output_length;
TEST_ASSERT( nonce_length <= sizeof( nonce ) );
TEST_ASSERT( tag_length <= sizeof( tag ) );
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
status = psa_aead_encrypt( key_slot, exercise_alg,
nonce, nonce_length,
NULL, 0,
NULL, 0,
tag, tag_length,
&output_length );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_ENCRYPT ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
memset( tag, 0, sizeof( tag ) );
status = psa_aead_decrypt( key_slot, exercise_alg,
nonce, nonce_length,
NULL, 0,
tag, tag_length,
NULL, 0,
&output_length );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_DECRYPT ) != 0 )
TEST_ASSERT( status == PSA_ERROR_INVALID_SIGNATURE );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void asymmetric_encryption_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int exercise_alg )
{
int key_slot = 1;
psa_key_policy_t policy;
psa_status_t status;
size_t key_bits;
size_t buffer_length;
unsigned char *buffer = NULL;
size_t output_length;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_information( key_slot,
NULL,
&key_bits ) == PSA_SUCCESS );
buffer_length = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE( key_type, key_bits,
exercise_alg );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( buffer, buffer_length );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
status = psa_asymmetric_encrypt( key_slot, exercise_alg,
NULL, 0,
NULL, 0,
buffer, buffer_length,
&output_length );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_ENCRYPT ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
Skip calling memset when the size is 0 memset(NULL, c, 0) has undefined behavior, so don't do it. clang-asan complains.
2018-09-26 18:19:24 +02:00
if( buffer_length != 0 )
memset( buffer, 0, buffer_length );
Tests: cover policy checks for all operations Add tests of key policy checks for MAC, cipher, AEAD, asymmetric encryption and asymmetric signature. For each category, test with/without the requisite usage flag in each direction, and test algorithm mismatch.
2018-07-06 16:53:09 +02:00
status = psa_asymmetric_decrypt( key_slot, exercise_alg,
buffer, buffer_length,
NULL, 0,
buffer, buffer_length,
&output_length );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_DECRYPT ) != 0 )
TEST_ASSERT( status == PSA_ERROR_INVALID_PADDING );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
mbedtls_free( buffer );
}
/* END_CASE */
/* BEGIN_CASE */
void asymmetric_signature_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int exercise_alg )
{
int key_slot = 1;
psa_key_policy_t policy;
psa_status_t status;
unsigned char payload[16] = {1};
size_t payload_length = sizeof( payload );
unsigned char signature[PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE] = {0};
size_t signature_length;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
status = psa_asymmetric_sign( key_slot, exercise_alg,
payload, payload_length,
signature, sizeof( signature ),
&signature_length );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_SIGN ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
memset( signature, 0, sizeof( signature ) );
status = psa_asymmetric_verify( key_slot, exercise_alg,
payload, payload_length,
signature, sizeof( signature ) );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_VERIFY ) != 0 )
TEST_ASSERT( status == PSA_ERROR_INVALID_SIGNATURE );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Add framework for simple key derivation New key type PSA_KEY_TYPE_DERIVE. New usage flag PSA_KEY_USAGE_DERIVE. New function psa_key_derivation. No key derivation algorithm is implemented yet. The code may not compile with -Wunused. Write some unit test code for psa_key_derivation. Most of it cannot be used yet due to the lack of a key derivation algorithm.
2018-07-12 17:17:20 +02:00
/* BEGIN_CASE */
void derive_key_policy( int policy_usage,
int policy_alg,
int key_type,
data_t *key_data,
int exercise_alg )
{
int key_slot = 1;
psa_key_policy_t policy;
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, policy_usage, policy_alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key_data->x, key_data->len ) == PSA_SUCCESS );
status = psa_key_derivation( &generator, key_slot,
exercise_alg,
NULL, 0,
NULL, 0,
1 );
if( policy_alg == exercise_alg &&
( policy_usage & PSA_KEY_USAGE_DERIVE ) != 0 )
TEST_ASSERT( status == PSA_SUCCESS );
else
TEST_ASSERT( status == PSA_ERROR_NOT_PERMITTED );
exit:
psa_generator_abort( &generator );
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
/* BEGIN_CASE */
void key_lifetime( int lifetime_arg )
{
int key_slot = 1;
Fix bad key type constant that worked by accident
2018-08-10 16:02:11 +02:00
psa_key_type_t key_type = PSA_KEY_TYPE_RAW_DATA;
Reorder PSA test cases to group them by topic * init-deinit * import-export * policies * lifetime * hash * MAC * cipher * AEAD * asymmetric sign * asymmetric verify * asymmetric encrypt-decrypt This commit only moves test functions and test cases around. It does not modify, add or remove tests.
2018-06-18 22:20:03 +02:00
unsigned char key[32] = {0};
psa_key_lifetime_t lifetime_set = lifetime_arg;
psa_key_lifetime_t lifetime_get;
memset( key, 0x2a, sizeof( key ) );
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
TEST_ASSERT( psa_set_key_lifetime( key_slot,
lifetime_set ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key, sizeof( key ) ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_lifetime( key_slot,
&lifetime_get ) == PSA_SUCCESS );
TEST_ASSERT( lifetime_get == lifetime_set );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void key_lifetime_set_fail( int key_slot_arg,
int lifetime_arg,
int expected_status_arg )
{
psa_key_slot_t key_slot = key_slot_arg;
psa_key_lifetime_t lifetime_set = lifetime_arg;
psa_status_t actual_status;
psa_status_t expected_status = expected_status_arg;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
actual_status = psa_set_key_lifetime( key_slot, lifetime_set );
if( actual_status == PSA_SUCCESS )
actual_status = psa_set_key_lifetime( key_slot, lifetime_set );
TEST_ASSERT( expected_status == actual_status );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
/* BEGIN_CASE */
void hash_setup( int alg_arg,
int expected_status_arg )
{
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_hash_operation_t operation;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Rename psa_hash_start -> psa_hash_setup Make function names for multipart operations more consistent (hash edition).
2018-07-08 19:46:38 +02:00
status = psa_hash_setup( &operation, alg );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_hash_abort( &operation );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
exit:
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void hash_finish( int alg_arg, data_t *input, data_t *expected_hash )
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
{
psa_algorithm_t alg = alg_arg;
Rename hash max sizes for consistency Use "hash" throughout the library, not "md" as in Mbed TLS.
2018-06-18 22:16:43 +02:00
unsigned char actual_hash[PSA_HASH_MAX_SIZE];
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
size_t actual_hash_length;
psa_hash_operation_t operation;
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
TEST_ASSERT( expected_hash->len == PSA_HASH_SIZE( alg ) );
TEST_ASSERT( expected_hash->len <= PSA_HASH_MAX_SIZE );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( input != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( expected_hash != NULL );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_hash->len ) );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Rename psa_hash_start -> psa_hash_setup Make function names for multipart operations more consistent (hash edition).
2018-07-08 19:46:38 +02:00
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_hash_update( &operation,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->x, input->len ) == PSA_SUCCESS );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_hash_finish( &operation,
actual_hash, sizeof( actual_hash ),
&actual_hash_length ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_hash->x, expected_hash->len,
actual_hash, actual_hash_length );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
exit:
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void hash_verify( int alg_arg, data_t *input, data_t *expected_hash )
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
{
psa_algorithm_t alg = alg_arg;
psa_hash_operation_t operation;
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
TEST_ASSERT( expected_hash->len == PSA_HASH_SIZE( alg ) );
TEST_ASSERT( expected_hash->len <= PSA_HASH_MAX_SIZE );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( input != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( expected_hash != NULL );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_hash->len ) );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Rename psa_hash_start -> psa_hash_setup Make function names for multipart operations more consistent (hash edition).
2018-07-08 19:46:38 +02:00
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_hash_update( &operation,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->x,
input->len ) == PSA_SUCCESS );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
TEST_ASSERT( psa_hash_verify( &operation,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
expected_hash->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
expected_hash->len ) == PSA_SUCCESS );
Implement hash functions New header file crypto_struct.h. The main file crypto.sh declares structures which are implementation-defined. These structures must be defined in crypto_struct.h, which is included at the end so that the structures can use types defined in crypto.h. Implement psa_hash_start, psa_hash_update and psa_hash_final. This should work for all hash algorithms supported by Mbed TLS, but has only been smoke-tested for SHA-256, and only in the nominal case.
2018-02-07 21:05:37 +01:00
exit:
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
/* BEGIN_CASE */
void mac_setup( int key_type_arg,
data_t *key,
int alg_arg,
int expected_status_arg )
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_mac_operation_t operation;
psa_key_policy_t policy;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy,
PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY,
alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS );
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
status = psa_mac_sign_setup( &operation, key_slot, alg );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_mac_abort( &operation );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
Add tests for mac_sign
2018-08-14 15:17:54 +02:00
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void mac_sign( int key_type_arg,
data_t *key,
int alg_arg,
data_t *input,
data_t *expected_mac )
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
psa_mac_operation_t operation;
psa_key_policy_t policy;
/* Leave a little extra room in the output buffer. At the end of the
* test, we'll check that the implementation didn't overwrite onto
* this extra room. */
uint8_t actual_mac[PSA_MAC_MAX_SIZE + 10];
size_t mac_buffer_size =
PSA_MAC_FINAL_SIZE( key_type, PSA_BYTES_TO_BITS( key->len ), alg );
size_t mac_length = 0;
memset( actual_mac, '+', sizeof( actual_mac ) );
TEST_ASSERT( mac_buffer_size <= PSA_MAC_MAX_SIZE );
TEST_ASSERT( expected_mac->len <= mac_buffer_size );
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_SIGN, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS );
/* Calculate the MAC. */
TEST_ASSERT( psa_mac_sign_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_mac_update( &operation,
input->x, input->len ) == PSA_SUCCESS );
TEST_ASSERT( psa_mac_sign_finish( &operation,
actual_mac, mac_buffer_size,
&mac_length ) == PSA_SUCCESS );
/* Compare with the expected value. */
TEST_ASSERT( mac_length == expected_mac->len );
TEST_ASSERT( memcmp( actual_mac, expected_mac->x, mac_length ) == 0 );
/* Verify that the end of the buffer is untouched. */
TEST_ASSERT( mem_is_char( actual_mac + mac_length, '+',
sizeof( actual_mac ) - mac_length ) );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
/* BEGIN_CASE */
mac_verify: remove unused IV argument We aren't going to have MAC with IV in the API any time soon, if at all, so remove the embryonic support for it in the tests.
2018-06-18 17:03:37 +02:00
void mac_verify( int key_type_arg,
data_t *key,
int alg_arg,
data_t *input,
data_t *expected_mac )
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
psa_mac_operation_t operation;
Add static internal MAC finish function add new psa_mac_finish_internal() to be called by psa_mac_finish() and psa_mac_verify() in order to be able to check key usage separatly.
2018-04-02 17:34:15 +02:00
psa_key_policy_t policy;
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
TEST_ASSERT( expected_mac->len <= PSA_MAC_MAX_SIZE );
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_mac != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_mac->len ) );
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Add static internal MAC finish function add new psa_mac_finish_internal() to be called by psa_mac_finish() and psa_mac_verify() in order to be able to check key usage separatly.
2018-04-02 17:34:15 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_VERIFY, alg );
Add static internal MAC finish function add new psa_mac_finish_internal() to be called by psa_mac_finish() and psa_mac_verify() in order to be able to check key usage separatly.
2018-04-02 17:34:15 +02:00
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
mac_verify: remove unused IV argument We aren't going to have MAC with IV in the API any time soon, if at all, so remove the embryonic support for it in the tests.
2018-06-18 17:03:37 +02:00
Split psa_mac_setup -> psa_mac_{sign,verify}_setup Make function names for multipart operations more consistent (MAC setup edition). Split psa_mac_setup into two functions psa_mac_sign_setup and psa_mac_verify_setup. These functions behave identically except that they require different usage flags on the key. The goal of the split is to enforce the key policy during setup rather than at the end of the operation (which was a bit of a hack). In psa_mac_sign_finish and psa_mac_verify_finish, if the operation is of the wrong type, abort the operation before returning BAD_STATE.
2018-07-08 20:12:23 +02:00
TEST_ASSERT( psa_mac_verify_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
TEST_ASSERT( psa_destroy_key( key_slot ) == PSA_SUCCESS );
TEST_ASSERT( psa_mac_update( &operation,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->x, input->len ) == PSA_SUCCESS );
Rename psa_mac_{finish,verify} -> psa_mac_{sign,verify}_finish Make function names for multipart operations more consistent (MAC finish edition).
2018-07-08 19:56:25 +02:00
TEST_ASSERT( psa_mac_verify_finish( &operation,
expected_mac->x,
expected_mac->len ) == PSA_SUCCESS );
PSA: Implement MAC functions Implement psa_mac_start, psa_mac_update and psa_mac_final. Implement HMAC anc CMAC. Smoke tests.
2018-02-08 10:02:12 +01:00
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
/* BEGIN_CASE */
void cipher_setup( int key_type_arg,
data_t *key,
int alg_arg,
int expected_status_arg )
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_cipher_operation_t operation;
psa_key_policy_t policy;
psa_status_t status;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS );
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
status = psa_cipher_encrypt_setup( &operation, key_slot, alg );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
psa_cipher_abort( &operation );
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
Fix potential memory corruption on MAC/cipher setup failure When psa_mac_start(), psa_encrypt_setup() or psa_cipher_setup() failed, depending on when the failure happened, it was possible that psa_mac_abort() or psa_cipher_abort() would crash because it would try to call a free() function uninitialized data in the operation structure. Refactor the functions so that they initialize the operation structure before doing anything else. Add non-regression tests and a few more positive and negative unit tests for psa_mac_start() and psa_cipher_setup() (the latter via psa_encrypt_setip()).
2018-06-20 16:05:20 +02:00
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_encrypt( int alg_arg, int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input, data_t *expected_output,
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
int expected_status_arg )
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
{
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
int key_slot = 1;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_status_t status;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
unsigned char iv[16] = {0};
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
size_t iv_size;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output_buffer_size = 0;
size_t function_output_length = 0;
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
size_t total_output_length = 0;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_cipher_operation_t operation;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_encrypt_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation,
iv, iv_size ) == PSA_SUCCESS );
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output_buffer_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_buffer_size );
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
input->x, input->len,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
status = psa_cipher_finish( &operation,
output + function_output_length,
output_buffer_size,
&function_output_length );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
if( expected_status == PSA_SUCCESS )
{
TEST_ASSERT( psa_cipher_abort( &operation ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_output->x, expected_output->len,
output, total_output_length );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
}
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_encrypt_multipart( int alg_arg, int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input,
int first_part_size,
data_t *expected_output )
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char iv[16] = {0};
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
size_t iv_size;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output_buffer_size = 0;
size_t function_output_length = 0;
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
size_t total_output_length = 0;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_cipher_operation_t operation;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_encrypt_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation,
iv, sizeof( iv ) ) == PSA_SUCCESS );
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output_buffer_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_buffer_size );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( (unsigned int) first_part_size < input->len );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( psa_cipher_update( &operation, input->x, first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
input->x + first_part_size,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->len - first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
TEST_ASSERT( psa_cipher_finish( &operation,
output + function_output_length,
output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_cipher_abort( &operation ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_output->x, expected_output->len,
output, total_output_length );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_destroy_key( key_slot );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_decrypt_multipart( int alg_arg, int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input,
int first_part_size,
data_t *expected_output )
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
{
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
int key_slot = 1;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
unsigned char iv[16] = {0};
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
size_t iv_size;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output_buffer_size = 0;
size_t function_output_length = 0;
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
size_t total_output_length = 0;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_cipher_operation_t operation;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_decrypt_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation,
iv, sizeof( iv ) ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output_buffer_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_buffer_size );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( (unsigned int) first_part_size < input->len );
TEST_ASSERT( psa_cipher_update( &operation,
input->x, first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
input->x + first_part_size,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->len - first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
TEST_ASSERT( psa_cipher_finish( &operation,
output + function_output_length,
output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_cipher_abort( &operation ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_output->x, expected_output->len,
output, total_output_length );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_destroy_key( key_slot );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_decrypt( int alg_arg, int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input, data_t *expected_output,
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
int expected_status_arg )
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
{
int key_slot = 1;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_status_t status;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
psa_status_t expected_status = expected_status_arg;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
unsigned char iv[16] = {0};
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
size_t iv_size;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output_buffer_size = 0;
size_t function_output_length = 0;
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
size_t total_output_length = 0;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_cipher_operation_t operation;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
Merge remote-tracking branch 'psa/pr/13' into feature-psa Conflicts: library/psa_crypto.c tests/suites/test_suite_psa_crypto.data tests/suites/test_suite_psa_crypto.function All the conflicts are concurrent additions where the order doesn't matter. I put the code from feature-psa (key policy) before the code from PR #13 (key lifetime).
2018-04-30 17:06:50 +02:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
Add what little was missing to fully support DES Also add what was missing in the test suite to support block ciphers with a block size that isn't 16. Fix some buggy test data that passed only due to problems with DES support in the product.
2018-06-21 09:40:04 +02:00
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_decrypt_setup( &operation,
key_slot, alg ) == PSA_SUCCESS );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation,
iv, iv_size ) == PSA_SUCCESS );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output_buffer_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_buffer_size );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( psa_cipher_update( &operation,
input->x, input->len,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output, output_buffer_size,
&function_output_length ) == PSA_SUCCESS );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
status = psa_cipher_finish( &operation,
output + function_output_length,
output_buffer_size,
&function_output_length );
Cipher tests: calculate and verify the actual output size
2018-06-08 14:40:59 +02:00
total_output_length += function_output_length;
Get rid of some casts in test_suite_psa_crypto Use more auxiliary variables to unmarshall int values.
2018-06-21 09:25:10 +02:00
TEST_ASSERT( status == expected_status );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
if( expected_status == PSA_SUCCESS )
{
TEST_ASSERT( psa_cipher_abort( &operation ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_output->x, expected_output->len,
output, total_output_length );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
}
Merge remote-tracking branch 'psa/pr/13' into feature-psa Conflicts: library/psa_crypto.c tests/suites/test_suite_psa_crypto.data tests/suites/test_suite_psa_crypto.function All the conflicts are concurrent additions where the order doesn't matter. I put the code from feature-psa (key policy) before the code from PR #13 (key lifetime).
2018-04-30 17:06:50 +02:00
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
add new test scenarios
2018-03-28 14:14:59 +02:00
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_verify_output( int alg_arg, int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input )
add new test scenarios
2018-03-28 14:14:59 +02:00
{
int key_slot = 1;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char iv[16] = {0};
size_t iv_size = 16;
size_t iv_length = 0;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output1 = NULL;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
size_t output1_size = 0;
size_t output1_length = 0;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output2 = NULL;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
size_t output2_size = 0;
size_t output2_length = 0;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t function_output_length = 0;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
psa_cipher_operation_t operation1;
psa_cipher_operation_t operation2;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
add new test scenarios
2018-03-28 14:14:59 +02:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_encrypt_setup( &operation1,
key_slot, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_decrypt_setup( &operation2,
key_slot, alg ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_generate_iv( &operation1,
iv, iv_size,
&iv_length ) == PSA_SUCCESS );
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output1_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output1, output1_size );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( psa_cipher_update( &operation1, input->x, input->len,
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
output1, output1_size,
&output1_length ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_finish( &operation1,
output1 + output1_length, output1_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
&function_output_length ) == PSA_SUCCESS );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output1_length += function_output_length;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_cipher_abort( &operation1 ) == PSA_SUCCESS );
output2_size = output1_length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output2, output2_size );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation2,
iv, iv_length ) == PSA_SUCCESS );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_update( &operation2, output1, output1_length,
output2, output2_size,
&output2_length ) == PSA_SUCCESS );
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
function_output_length = 0;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_finish( &operation2,
output2 + output2_length,
output2_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
&function_output_length ) == PSA_SUCCESS );
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output2_length += function_output_length;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
Fix copy paste error PSA test suite At this point it fixes memory leaks as well. These memory leaks are the fault of the 'psa_cipher_finish()' function and the calls fixed in this commit (among with many others in the test suite) will become obsolete after fixing 'psa_cipher_finish()'.
2018-07-06 17:23:25 +02:00
TEST_ASSERT( psa_cipher_abort( &operation2 ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( input->x, input->len, output2, output2_length );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output1 );
mbedtls_free( output2 );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
void cipher_verify_output_multipart( int alg_arg,
int key_type_arg,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
data_t *key,
data_t *input,
We don't need _test_ in test function names Also fix typo multpart -> multipart
2018-06-08 14:28:46 +02:00
int first_part_size )
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
{
int key_slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char iv[16] = {0};
size_t iv_size = 16;
size_t iv_length = 0;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output1 = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output1_buffer_size = 0;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
size_t output1_length = 0;
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
unsigned char *output2 = NULL;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t output2_buffer_size = 0;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
size_t output2_length = 0;
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
size_t function_output_length;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
psa_cipher_operation_t operation1;
psa_cipher_operation_t operation2;
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_t policy;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Fix tests in test_suite_psa_crypto to set policy usage
2018-07-05 14:22:45 +02:00
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( psa_import_key( key_slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key->x, key->len ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_encrypt_setup( &operation1,
key_slot, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_cipher_decrypt_setup( &operation2,
key_slot, alg ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_generate_iv( &operation1,
iv, iv_size,
&iv_length ) == PSA_SUCCESS );
Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size Use PSA_BLOCK_CIPHER_BLOCK_SIZE() macro to get the cipher block size instead of accessing the operation struct additionally, for SPM case, the 'block_size' member is not a member in the operation struct
2018-07-03 12:15:54 +02:00
output1_buffer_size = (size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output1, output1_buffer_size );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
TEST_ASSERT( (unsigned int) first_part_size < input->len );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( psa_cipher_update( &operation1, input->x, first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output1, output1_buffer_size,
&function_output_length ) == PSA_SUCCESS );
output1_length += function_output_length;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_update( &operation1,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
input->x + first_part_size,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input->len - first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output1, output1_buffer_size,
&function_output_length ) == PSA_SUCCESS );
output1_length += function_output_length;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
TEST_ASSERT( psa_cipher_finish( &operation1,
output1 + output1_length,
output1_buffer_size - output1_length,
&function_output_length ) == PSA_SUCCESS );
output1_length += function_output_length;
Reordered cipher tests to be just after MAC tests
2018-06-06 15:19:24 +02:00
TEST_ASSERT( psa_cipher_abort( &operation1 ) == PSA_SUCCESS );
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output2_buffer_size = output1_length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output2, output2_buffer_size );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename psa cipher functions to psa_cipher_xxx Make function names for multipart operations more consistent (cipher edition). Rename symmetric cipher multipart operation functions so that they all start with psa_cipher_: * psa_encrypt_setup -> psa_cipher_encrypt_setup * psa_decrypt_setup -> psa_cipher_decrypt_setup * psa_encrypt_set_iv -> psa_cipher_set_iv * psa_encrypt_generate_iv -> psa_cipher_generate_iv
2018-07-08 21:39:34 +02:00
TEST_ASSERT( psa_cipher_set_iv( &operation2,
iv, iv_length ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
TEST_ASSERT( psa_cipher_update( &operation2, output1, first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output2, output2_buffer_size,
&function_output_length ) == PSA_SUCCESS );
output2_length += function_output_length;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
TEST_ASSERT( psa_cipher_update( &operation2,
output1 + first_part_size,
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
output1_length - first_part_size,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output2, output2_buffer_size,
&function_output_length ) == PSA_SUCCESS );
output2_length += function_output_length;
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
TEST_ASSERT( psa_cipher_finish( &operation2,
output2 + output2_length,
Rename some variables to make the code easier to read In cipher_test_verify_output_multpart, tweak the ways chunk sizes are added in order to get rid of the variable temp. In other functions, this commit does not change the logic at all.
2018-06-08 14:20:49 +02:00
output2_buffer_size - output2_length,
&function_output_length ) == PSA_SUCCESS );
output2_length += function_output_length;
Fix whitespace issues Only whitespace changes. * Remove tabs. * Remove trailing whitespace. * Correct some misindented lines. * Normalize whitespace around some punctuation. * Split some lines to avoid going over 80 columns.
2018-06-06 18:44:09 +02:00
Fix copy paste error PSA test suite At this point it fixes memory leaks as well. These memory leaks are the fault of the 'psa_cipher_finish()' function and the calls fixed in this commit (among with many others in the test suite) will become obsolete after fixing 'psa_cipher_finish()'.
2018-07-06 17:23:25 +02:00
TEST_ASSERT( psa_cipher_abort( &operation2 ) == PSA_SUCCESS );
fix and add tests case + fix for padding mode
2018-06-06 15:36:50 +02:00
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( input->x, input->len, output2, output2_length );
add new test scenarios
2018-03-28 14:14:59 +02:00
exit:
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output1 );
mbedtls_free( output2 );
add new test scenarios
2018-03-28 14:14:59 +02:00
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Merge remote-tracking branch 'psa/pr/13' into feature-psa Conflicts: library/psa_crypto.c tests/suites/test_suite_psa_crypto.data tests/suites/test_suite_psa_crypto.function All the conflicts are concurrent additions where the order doesn't matter. I put the code from feature-psa (key policy) before the code from PR #13 (key lifetime).
2018-04-30 17:06:50 +02:00
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
/* BEGIN_CASE */
Reorder parameters of AEAD unit tests to be more logical Pass the nonce first, then the AD, then the input. This is the order in which the data is processed and it's the order of the parameters to the API functions.
2018-08-17 18:45:42 +02:00
void aead_encrypt_decrypt( int key_type_arg, data_t *key_data,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
int alg_arg,
Reorder parameters of AEAD unit tests to be more logical Pass the nonce first, then the AD, then the input. This is the order in which the data is processed and it's the order of the parameters to the API functions.
2018-08-17 18:45:42 +02:00
data_t *nonce,
data_t *additional_data,
data_t *input_data,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
int expected_result_arg )
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char *output_data = NULL;
size_t output_size = 0;
size_t output_length = 0;
unsigned char *output_data2 = NULL;
size_t output_length2 = 0;
size_t tag_length = 16;
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_status_t expected_result = expected_result_arg;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( additional_data != NULL );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output_size = input_data->len + tag_length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_data, output_size );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
psa_key_policy_set_usage( &policy,
PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT,
alg );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x, key_data->len ) == PSA_SUCCESS );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_aead_encrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
nonce->x, nonce->len,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
additional_data->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
additional_data->len,
input_data->x, input_data->len,
output_data, output_size,
&output_length ) == expected_result );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
if( PSA_SUCCESS == expected_result )
{
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_data2, output_length );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_aead_decrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
nonce->x, nonce->len,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
additional_data->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
additional_data->len,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
output_data, output_length,
output_data2, output_length,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
&output_length2 ) == expected_result );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( input_data->x, input_data->len,
output_data2, output_length2 );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
}
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
exit:
psa_destroy_key( slot );
mbedtls_free( output_data );
mbedtls_free( output_data2 );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
Reorder parameters of AEAD unit tests to be more logical Pass the nonce first, then the AD, then the input. This is the order in which the data is processed and it's the order of the parameters to the API functions.
2018-08-17 18:45:42 +02:00
void aead_encrypt( int key_type_arg, data_t *key_data,
int alg_arg,
data_t *nonce,
data_t *additional_data,
data_t *input_data,
data_t *expected_result )
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char *output_data = NULL;
size_t output_size = 0;
size_t output_length = 0;
size_t tag_length = 16;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( additional_data != NULL );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( expected_result != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_result->len ) );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output_size = input_data->len + tag_length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_data, output_size );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT , alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_aead_encrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
nonce->x, nonce->len,
additional_data->x, additional_data->len,
input_data->x, input_data->len,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
output_data, output_size,
&output_length ) == PSA_SUCCESS );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_result->x, expected_result->len,
output_data, output_length );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
exit:
psa_destroy_key( slot );
mbedtls_free( output_data );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
Reorder parameters of AEAD unit tests to be more logical Pass the nonce first, then the AD, then the input. This is the order in which the data is processed and it's the order of the parameters to the API functions.
2018-08-17 18:45:42 +02:00
void aead_decrypt( int key_type_arg, data_t *key_data,
int alg_arg,
data_t *nonce,
data_t *additional_data,
data_t *input_data,
data_t *expected_data,
int expected_result_arg )
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char *output_data = NULL;
size_t output_size = 0;
size_t output_length = 0;
size_t tag_length = 16;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_status_t expected_result = expected_result_arg;
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( additional_data != NULL );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( expected_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_data->len ) );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output_size = input_data->len + tag_length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_data, output_size );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT , alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
TEST_ASSERT( psa_aead_decrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
nonce->x, nonce->len,
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
additional_data->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
additional_data->len,
input_data->x, input_data->len,
output_data, output_size,
&output_length ) == expected_result );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
if( expected_result == PSA_SUCCESS )
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_data->x, expected_data->len,
output_data, output_length );
Move AEAD tests just after cipher Always adding things at the end tends to create merge conflicts. Adding in the middle in this way makes the order more logical in addition to avoiding conflicts.
2018-06-11 19:33:02 +02:00
exit:
psa_destroy_key( slot );
mbedtls_free( output_data );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
/* BEGIN_CASE */
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
void signature_size( int type_arg,
int bits,
int alg_arg,
int expected_size_arg )
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
{
psa_key_type_t type = type_arg;
psa_algorithm_t alg = alg_arg;
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
size_t actual_size = PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE( type, bits, alg );
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
TEST_ASSERT( actual_size == (size_t) expected_size_arg );
exit:
;
}
/* END_CASE */
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void sign_deterministic( int key_type_arg, data_t *key_data,
int alg_arg, data_t *input_data,
data_t *output_data )
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
size_t key_bits;
unsigned char *signature = NULL;
size_t signature_size;
PSA asymmetric signature: set *signature_length = 0 on failure
2018-02-03 23:58:03 +01:00
size_t signature_length = 0xdeadbeef;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( output_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( output_data->len ) );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_SIGN, alg );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
TEST_ASSERT( psa_get_key_information( slot,
NULL,
&key_bits ) == PSA_SUCCESS );
Document what the signature tests are doing a bit better Add a check that the purported output length is less than the buffer size in sign_fail.
2018-06-28 12:23:00 +02:00
/* Allocate a buffer which has the size advertized by the
* library. */
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
signature_size = PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE( key_type,
key_bits, alg );
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
TEST_ASSERT( signature_size != 0 );
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
TEST_ASSERT( signature_size <= PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( signature, signature_size );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
Document what the signature tests are doing a bit better Add a check that the purported output length is less than the buffer size in sign_fail.
2018-06-28 12:23:00 +02:00
/* Perform the signature. */
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_asymmetric_sign( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input_data->x, input_data->len,
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
signature, signature_size,
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
&signature_length ) == PSA_SUCCESS );
Add sign_verify test and use it to smoke-test PSS
2018-06-29 17:30:48 +02:00
/* Verify that the signature is what is expected. */
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( output_data->x, output_data->len,
signature, signature_length );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
exit:
psa_destroy_key( slot );
PSA crypto: PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE macro Test it for RSA.
2018-02-03 23:57:22 +01:00
mbedtls_free( signature );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void sign_fail( int key_type_arg, data_t *key_data,
int alg_arg, data_t *input_data,
Document what the signature tests are doing a bit better Add a check that the purported output length is less than the buffer size in sign_fail.
2018-06-28 12:23:00 +02:00
int signature_size_arg, int expected_status_arg )
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Document what the signature tests are doing a bit better Add a check that the purported output length is less than the buffer size in sign_fail.
2018-06-28 12:23:00 +02:00
size_t signature_size = signature_size_arg;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
psa_status_t actual_status;
psa_status_t expected_status = expected_status_arg;
Use unhexify_alloc where applicable
2018-03-07 16:43:36 +01:00
unsigned char *signature = NULL;
PSA asymmetric signature: set *signature_length = 0 on failure
2018-02-03 23:58:03 +01:00
size_t signature_length = 0xdeadbeef;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( signature, signature_size );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_SIGN, alg );
Add calls for set policy in export/sign tests Add calls for set policy in export/sign tests
2018-03-28 12:46:26 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
actual_status = psa_asymmetric_sign( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input_data->x, input_data->len,
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
signature, signature_size,
&signature_length );
TEST_ASSERT( actual_status == expected_status );
Document what the signature tests are doing a bit better Add a check that the purported output length is less than the buffer size in sign_fail.
2018-06-28 12:23:00 +02:00
/* The value of *signature_length is unspecified on error, but
* whatever it is, it should be less than signature_size, so that
* if the caller tries to read *signature_length bytes without
* checking the error code then they don't overflow a buffer. */
TEST_ASSERT( signature_length <= signature_size );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
exit:
psa_destroy_key( slot );
mbedtls_free( signature );
mbedtls_psa_crypto_free( );
Add sign_verify test and use it to smoke-test PSS
2018-06-29 17:30:48 +02:00
}
/* END_CASE */
/* BEGIN_CASE */
void sign_verify( int key_type_arg, data_t *key_data,
int alg_arg, data_t *input_data )
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
size_t key_bits;
unsigned char *signature = NULL;
size_t signature_size;
size_t signature_length = 0xdeadbeef;
psa_key_policy_t policy;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy,
PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY,
alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
key_data->x,
key_data->len ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_information( slot,
NULL,
&key_bits ) == PSA_SUCCESS );
/* Allocate a buffer which has the size advertized by the
* library. */
signature_size = PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE( key_type,
key_bits, alg );
TEST_ASSERT( signature_size != 0 );
TEST_ASSERT( signature_size <= PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( signature, signature_size );
Add sign_verify test and use it to smoke-test PSS
2018-06-29 17:30:48 +02:00
/* Perform the signature. */
TEST_ASSERT( psa_asymmetric_sign( slot, alg,
input_data->x, input_data->len,
signature, signature_size,
&signature_length ) == PSA_SUCCESS );
/* Check that the signature length looks sensible. */
TEST_ASSERT( signature_length <= signature_size );
TEST_ASSERT( signature_length > 0 );
/* Use the library to verify that the signature is correct. */
TEST_ASSERT( psa_asymmetric_verify(
slot, alg,
input_data->x, input_data->len,
signature, signature_length ) == PSA_SUCCESS );
if( input_data->len != 0 )
{
/* Flip a bit in the input and verify that the signature is now
* detected as invalid. Flip a bit at the beginning, not at the end,
* because ECDSA may ignore the last few bits of the input. */
input_data->x[0] ^= 1;
TEST_ASSERT( psa_asymmetric_verify(
slot, alg,
input_data->x, input_data->len,
signature,
signature_length ) == PSA_ERROR_INVALID_SIGNATURE );
}
exit:
psa_destroy_key( slot );
mbedtls_free( signature );
mbedtls_psa_crypto_free( );
PSA crypto: asymmetric signature (RSA PKCS#1v1.5 only) Define hash algorithms and RSA signature algorithms. New function psa_asymmetric_sign. Implement psa_asymmetric_sign for RSA PKCS#1 v1.5.
2018-02-03 22:44:14 +01:00
}
/* END_CASE */
Key Policy APIs implementation
2018-03-28 00:21:33 +02:00
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void asymmetric_verify( int key_type_arg, data_t *key_data,
int alg_arg, data_t *hash_data,
data_t *signature_data )
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
Use PSA_xxx_MAX_SIZE for hash/MAC/signature size in tests In tests that had a hard-coded buffer size, use PSA_MAC_MAX_SIZE or PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE as appropriate. Test that PSA_xxx_MAX_SIZE is larger than the size used in tests that expect a specific output.
2018-06-28 00:07:19 +02:00
TEST_ASSERT( signature_data->len <= PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE );
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( hash_data != NULL );
TEST_ASSERT( signature_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( hash_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( signature_data->len ) );
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_VERIFY, alg );
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
TEST_ASSERT( psa_asymmetric_verify( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
hash_data->x, hash_data->len,
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
signature_data->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
signature_data->len ) == PSA_SUCCESS );
ECDSA sign and verify implementation and tests ECDSA sign and verify implementation and tests
2018-05-08 10:18:38 +02:00
exit:
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
/* BEGIN_CASE */
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
void asymmetric_verify_fail( int key_type_arg, data_t *key_data,
int alg_arg, data_t *hash_data,
data_t *signature_data,
int expected_status_arg )
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
psa_status_t actual_status;
psa_status_t expected_status = expected_status_arg;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( hash_data != NULL );
TEST_ASSERT( signature_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( hash_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( signature_data->len ) );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_VERIFY, alg );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
actual_status = psa_asymmetric_verify( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
hash_data->x, hash_data->len,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
signature_data->x,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
signature_data->len );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( actual_status == expected_status );
exit:
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Add positive asymmetric encryption tests Revise the test function asymmetric_encrypt_fail into asymmetric_encrypt and use it for positive tests as well. Get the expected output length from PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE. Check the actual output length against test data. Add positive test cases for encryption: one with an RSA public key (this is the only test for encryption with a public key rather than a key pair) and one with a key pair.
2018-06-29 19:12:28 +02:00
/* BEGIN_CASE */
void asymmetric_encrypt( int key_type_arg,
data_t *key_data,
int alg_arg,
data_t *input_data,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
data_t *label,
Add positive asymmetric encryption tests Revise the test function asymmetric_encrypt_fail into asymmetric_encrypt and use it for positive tests as well. Get the expected output length from PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE. Check the actual output length against test data. Add positive test cases for encryption: one with an RSA public key (this is the only test for encryption with a public key rather than a key pair) and one with a key pair.
2018-06-29 19:12:28 +02:00
int expected_output_length_arg,
int expected_status_arg )
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
size_t expected_output_length = expected_output_length_arg;
size_t key_bits;
unsigned char *output = NULL;
size_t output_size;
size_t output_length = ~0;
psa_status_t actual_status;
psa_status_t expected_status = expected_status_arg;
psa_key_policy_t policy;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
/* Import the key */
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
key_data->x,
key_data->len ) == PSA_SUCCESS );
/* Determine the maximum output length */
TEST_ASSERT( psa_get_key_information( slot,
NULL,
&key_bits ) == PSA_SUCCESS );
output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE( key_type, key_bits, alg );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_size );
Add positive asymmetric encryption tests Revise the test function asymmetric_encrypt_fail into asymmetric_encrypt and use it for positive tests as well. Get the expected output length from PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE. Check the actual output length against test data. Add positive test cases for encryption: one with an RSA public key (this is the only test for encryption with a public key rather than a key pair) and one with a key pair.
2018-06-29 19:12:28 +02:00
/* Encrypt the input */
actual_status = psa_asymmetric_encrypt( slot, alg,
input_data->x, input_data->len,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
label->x, label->len,
Add positive asymmetric encryption tests Revise the test function asymmetric_encrypt_fail into asymmetric_encrypt and use it for positive tests as well. Get the expected output length from PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE. Check the actual output length against test data. Add positive test cases for encryption: one with an RSA public key (this is the only test for encryption with a public key rather than a key pair) and one with a key pair.
2018-06-29 19:12:28 +02:00
output, output_size,
&output_length );
TEST_ASSERT( actual_status == expected_status );
TEST_ASSERT( output_length == expected_output_length );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
/* If the label is empty, the test framework puts a non-null pointer
* in label->x. Test that a null pointer works as well. */
if( label->len == 0 )
{
output_length = ~0;
Skip calling memset when the size is 0 memset(NULL, c, 0) has undefined behavior, so don't do it. clang-asan complains.
2018-09-26 18:19:24 +02:00
if( output_size != 0 )
memset( output, 0, output_size );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
actual_status = psa_asymmetric_encrypt( slot, alg,
input_data->x, input_data->len,
NULL, label->len,
output, output_size,
&output_length );
TEST_ASSERT( actual_status == expected_status );
TEST_ASSERT( output_length == expected_output_length );
}
Add positive asymmetric encryption tests Revise the test function asymmetric_encrypt_fail into asymmetric_encrypt and use it for positive tests as well. Get the expected output length from PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE. Check the actual output length against test data. Add positive test cases for encryption: one with an RSA public key (this is the only test for encryption with a public key rather than a key pair) and one with a key pair.
2018-06-29 19:12:28 +02:00
exit:
psa_destroy_key( slot );
mbedtls_free( output );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
/* BEGIN_CASE */
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
void asymmetric_encrypt_decrypt( int key_type_arg,
data_t *key_data,
int alg_arg,
data_t *input_data,
data_t *label )
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
size_t key_bits;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
unsigned char *output = NULL;
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
size_t output_size;
size_t output_length = ~0;
change RSA encryption tests compensate for random component in encryption.
2018-05-02 22:56:12 +02:00
unsigned char *output2 = NULL;
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
size_t output2_size;
size_t output2_length = ~0;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
psa_key_policy_init( &policy );
Formatting improvements Avoid lines longer than 80 columns. Remove some redundant parentheses, e.g. change if( ( a == b ) && ( c == d ) ) to if( a == b && c == d ) which makes lines less long and makes the remaining parentheses more relevant. Add missing parentheses around return statements. There should be no semantic change in this commit.
2018-06-18 16:04:39 +02:00
psa_key_policy_set_usage( &policy,
PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
alg );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
/* Determine the maximum ciphertext length */
TEST_ASSERT( psa_get_key_information( slot,
NULL,
&key_bits ) == PSA_SUCCESS );
output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE( key_type, key_bits, alg );
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_size );
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
output2_size = input_data->len;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output2, output2_size );
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
Rename asymmetric_encrypt to clarify what it does Renamed to asymmetric_encrypt_decrypt
2018-06-08 18:11:54 +02:00
/* We test encryption by checking that encrypt-then-decrypt gives back
* the original plaintext because of the non-optional random
* part of encryption process which prevents using fixed vectors. */
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
TEST_ASSERT( psa_asymmetric_encrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input_data->x, input_data->len,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
label->x, label->len,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output, output_size,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
&output_length ) == PSA_SUCCESS );
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
/* We don't know what ciphertext length to expect, but check that
* it looks sensible. */
TEST_ASSERT( output_length <= output_size );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
TEST_ASSERT( psa_asymmetric_decrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output, output_length,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
label->x, label->len,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output2, output2_size,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
&output2_length ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( input_data->x, input_data->len,
output2, output2_length );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
exit:
psa_destroy_key( slot );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
mbedtls_free( output2 );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
void asymmetric_decrypt( int key_type_arg,
data_t *key_data,
int alg_arg,
data_t *input_data,
data_t *label,
asymmetric_decrypt test: remove redundant argument The expected output size is the size of the expected output, it doesn't need to be passed separately.
2018-06-29 21:54:10 +02:00
data_t *expected_data )
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char *output = NULL;
Fix test output size 1. set output size to safe value 2. set output size correctly 3. check correct length of actual output
2018-06-04 15:31:13 +02:00
size_t output_size = 0;
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
size_t output_length = ~0;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( expected_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_data->len ) );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output_size = key_data->len;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_size );
Remove trailing whitespace Only horizontal whitespace changes in this commit.
2018-05-31 13:25:48 +02:00
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
change RSA encryption tests compensate for random component in encryption.
2018-05-02 22:56:12 +02:00
TEST_ASSERT( psa_asymmetric_decrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input_data->x, input_data->len,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
label->x, label->len,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
output,
output_size,
&output_length ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_data->x, expected_data->len,
output, output_length );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
/* If the label is empty, the test framework puts a non-null pointer
* in label->x. Test that a null pointer works as well. */
if( label->len == 0 )
{
output_length = ~0;
Skip calling memset when the size is 0 memset(NULL, c, 0) has undefined behavior, so don't do it. clang-asan complains.
2018-09-26 18:19:24 +02:00
if( output_size != 0 )
memset( output, 0, output_size );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
TEST_ASSERT( psa_asymmetric_decrypt( slot, alg,
input_data->x, input_data->len,
NULL, label->len,
output,
output_size,
&output_length ) == PSA_SUCCESS );
Use ASSERT_COMPARE instead of memcmp in PSA tests This commit fixes some missing size comparison. In aead_encrypt_decrypt, aead_encrypt and aead_decrypt, the test code would not have noticed if the library function had reported an output length that was not the expected length.
2018-09-27 13:57:19 +02:00
ASSERT_COMPARE( expected_data->x, expected_data->len,
output, output_length );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
}
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
exit:
psa_destroy_key( slot );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
mbedtls_free( output );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
void asymmetric_decrypt_fail( int key_type_arg,
data_t *key_data,
int alg_arg,
data_t *input_data,
data_t *label,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
int expected_status_arg )
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
{
int slot = 1;
psa_key_type_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
unsigned char *output = NULL;
Fix test output size 1. set output size to safe value 2. set output size correctly 3. check correct length of actual output
2018-06-04 15:31:13 +02:00
size_t output_size = 0;
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
size_t output_length = ~0;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
psa_status_t actual_status;
psa_status_t expected_status = expected_status_arg;
Remove redundant initialization of policies to {0} Some compilers don't like initializing a structure to {0} (incomplete initializer). It's redundant anyway since we always call psa_key_policy_init.
2018-06-18 18:12:37 +02:00
psa_key_policy_t policy;
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
On target testing tests adaptation Updated all psa crypto tests to use the new test format
2018-06-12 16:06:52 +02:00
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output_size = key_data->len;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, output_size );
Remove trailing whitespace Only horizontal whitespace changes in this commit.
2018-05-31 13:25:48 +02:00
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
psa_key_policy_init( &policy );
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
add key policy enforcement implementation add checks that keys have been set for the correct usage for asymmetric functions.
2018-06-04 15:45:27 +02:00
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( psa_import_key( slot, key_type,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
key_data->x,
key_data->len ) == PSA_SUCCESS );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
actual_status = psa_asymmetric_decrypt( slot, alg,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
input_data->x, input_data->len,
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
label->x, label->len,
Hygiene improvements in PSA crypto test code Get rid of many redundant casts. In particular, it is not useful to cast uint32_t values to size_t before performing arithmetic or comparisons on them. Rewrap a number of function calls, many of which now have narrower arguments thanks to the removed casts. When a function call doesn't fit on a single line, avoid grouping unrelated parameters together, but do try to group a buffer pointer and the associated size. Define more auxiliary variables xxx of a particular integer type (psa_algorithm_t, psa_key_usage_t, etc.) corresponding to a test function xxx_arg which has the type int. This avoids the need to cast xxx_arg to an unsigned type sometimes in the code.
2018-06-18 16:35:34 +02:00
output, output_size,
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
&output_length );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
TEST_ASSERT( actual_status == expected_status );
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
TEST_ASSERT( output_length <= output_size );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
/* If the label is empty, the test framework puts a non-null pointer
* in label->x. Test that a null pointer works as well. */
if( label->len == 0 )
{
output_length = ~0;
Skip calling memset when the size is 0 memset(NULL, c, 0) has undefined behavior, so don't do it. clang-asan complains.
2018-09-26 18:19:24 +02:00
if( output_size != 0 )
memset( output, 0, output_size );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
actual_status = psa_asymmetric_decrypt( slot, alg,
input_data->x, input_data->len,
NULL, label->len,
output, output_size,
&output_length );
TEST_ASSERT( actual_status == expected_status );
Asymmetric encrypt/decrypt tests: check output length In asymmetric_encrypt_decrypt, use the buffer size advertized by the library for the ciphertext, and the length of the plaintext for the re-decrypted output. Test the output length if known. Require it to be 0 on error for encrypt/decrypt functions. If the output length is unknown, test at least that it's within the buffer limits.
2018-06-30 18:54:48 +02:00
TEST_ASSERT( output_length <= output_size );
Asymmetric encryption tests: allow label argument Add a label argument to all asymmetric encryption test functions (currently empty in all tests, but that will change soon). In asymmetric_encrypt and asymmetric_decrypt, with an empty label, test with both a null pointer and a non-null pointer.
2018-06-30 18:42:41 +02:00
}
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
exit:
psa_destroy_key( slot );
Normalize whitespace Normalize whitespace to Mbed TLS standards. There are only whitespace changes in this commit.
2018-06-18 15:41:12 +02:00
mbedtls_free( output );
added support for PKCSv1.5 signature verification and encryption/decryption and very basic tests.
2018-05-02 22:16:26 +02:00
mbedtls_psa_crypto_free( );
}
Remove trailing whitespace Only horizontal whitespace changes in this commit.
2018-05-31 13:25:48 +02:00
/* END_CASE */
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
Add framework for simple key derivation New key type PSA_KEY_TYPE_DERIVE. New usage flag PSA_KEY_USAGE_DERIVE. New function psa_key_derivation. No key derivation algorithm is implemented yet. The code may not compile with -Wunused. Write some unit test code for psa_key_derivation. Most of it cannot be used yet due to the lack of a key derivation algorithm.
2018-07-12 17:17:20 +02:00
/* BEGIN_CASE */
void derive_setup( int key_type_arg,
data_t *key_data,
int alg_arg,
data_t *salt,
data_t *label,
int requested_capacity_arg,
int expected_status_arg )
{
psa_key_slot_t slot = 1;
size_t key_type = key_type_arg;
psa_algorithm_t alg = alg_arg;
size_t requested_capacity = requested_capacity_arg;
psa_status_t expected_status = expected_status_arg;
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
psa_key_policy_t policy;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DERIVE, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, key_type,
key_data->x,
key_data->len ) == PSA_SUCCESS );
TEST_ASSERT( psa_key_derivation( &generator, slot, alg,
salt->x, salt->len,
label->x, label->len,
requested_capacity ) == expected_status );
exit:
psa_generator_abort( &generator );
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
HKDF: positive tests
2018-07-12 17:24:54 +02:00
/* BEGIN_CASE */
void derive_output( int alg_arg,
data_t *key_data,
data_t *salt,
data_t *label,
int requested_capacity_arg,
data_t *expected_output1,
data_t *expected_output2 )
{
psa_key_slot_t slot = 1;
psa_algorithm_t alg = alg_arg;
size_t requested_capacity = requested_capacity_arg;
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
uint8_t *expected_outputs[2] =
{expected_output1->x, expected_output2->x};
size_t output_sizes[2] =
{expected_output1->len, expected_output2->len};
size_t output_buffer_size = 0;
uint8_t *output_buffer = NULL;
size_t expected_capacity;
size_t current_capacity;
psa_key_policy_t policy;
psa_status_t status;
unsigned i;
for( i = 0; i < ARRAY_LENGTH( expected_outputs ); i++ )
{
if( output_sizes[i] > output_buffer_size )
output_buffer_size = output_sizes[i];
if( output_sizes[i] == 0 )
expected_outputs[i] = NULL;
}
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_buffer, output_buffer_size );
HKDF: positive tests
2018-07-12 17:24:54 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DERIVE, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, PSA_KEY_TYPE_DERIVE,
key_data->x,
key_data->len ) == PSA_SUCCESS );
/* Extraction phase. */
TEST_ASSERT( psa_key_derivation( &generator, slot, alg,
salt->x, salt->len,
label->x, label->len,
requested_capacity ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_generator_capacity( &generator,
&current_capacity ) ==
PSA_SUCCESS );
TEST_ASSERT( current_capacity == requested_capacity );
expected_capacity = requested_capacity;
/* Expansion phase. */
for( i = 0; i < ARRAY_LENGTH( expected_outputs ); i++ )
{
/* Read some bytes. */
status = psa_generator_read( &generator,
output_buffer, output_sizes[i] );
if( expected_capacity == 0 && output_sizes[i] == 0 )
{
/* Reading 0 bytes when 0 bytes are available can go either way. */
TEST_ASSERT( status == PSA_SUCCESS ||
status == PSA_ERROR_INSUFFICIENT_CAPACITY );
continue;
}
else if( expected_capacity == 0 ||
output_sizes[i] > expected_capacity )
{
/* Capacity exceeded. */
TEST_ASSERT( status == PSA_ERROR_INSUFFICIENT_CAPACITY );
expected_capacity = 0;
continue;
}
/* Success. Check the read data. */
TEST_ASSERT( status == PSA_SUCCESS );
if( output_sizes[i] != 0 )
TEST_ASSERT( memcmp( output_buffer, expected_outputs[i],
output_sizes[i] ) == 0 );
/* Check the generator status. */
expected_capacity -= output_sizes[i];
TEST_ASSERT( psa_get_generator_capacity( &generator,
&current_capacity ) ==
PSA_SUCCESS );
TEST_ASSERT( expected_capacity == current_capacity );
}
TEST_ASSERT( psa_generator_abort( &generator ) == PSA_SUCCESS );
exit:
mbedtls_free( output_buffer );
psa_generator_abort( &generator );
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
HKDF: be more robust if we reach the maximum ouptut length In psa_generator_hkdf_read, return BAD_STATE if we're trying to construct more output than the algorithm allows. This can't happen through the API due to the capacity limit, but it could potentially happen in an internal call. Also add a test case that verifies that we can set up HKDF with its maximum capacity and read up to the maximum capacity.
2018-07-17 21:06:59 +02:00
/* BEGIN_CASE */
void derive_full( int alg_arg,
data_t *key_data,
data_t *salt,
data_t *label,
int requested_capacity_arg )
{
psa_key_slot_t slot = 1;
psa_algorithm_t alg = alg_arg;
size_t requested_capacity = requested_capacity_arg;
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
unsigned char output_buffer[16];
size_t expected_capacity = requested_capacity;
size_t current_capacity;
psa_key_policy_t policy;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DERIVE, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( slot, PSA_KEY_TYPE_DERIVE,
key_data->x,
key_data->len ) == PSA_SUCCESS );
/* Extraction phase. */
TEST_ASSERT( psa_key_derivation( &generator, slot, alg,
salt->x, salt->len,
label->x, label->len,
requested_capacity ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_generator_capacity( &generator,
&current_capacity ) ==
PSA_SUCCESS );
TEST_ASSERT( current_capacity == expected_capacity );
/* Expansion phase. */
while( current_capacity > 0 )
{
size_t read_size = sizeof( output_buffer );
if( read_size > current_capacity )
read_size = current_capacity;
TEST_ASSERT( psa_generator_read( &generator,
output_buffer,
read_size ) == PSA_SUCCESS );
expected_capacity -= read_size;
TEST_ASSERT( psa_get_generator_capacity( &generator,
&current_capacity ) ==
PSA_SUCCESS );
TEST_ASSERT( current_capacity == expected_capacity );
}
/* Check that the generator refuses to go over capacity. */
TEST_ASSERT( psa_generator_read( &generator,
output_buffer,
1 ) == PSA_ERROR_INSUFFICIENT_CAPACITY );
TEST_ASSERT( psa_generator_abort( &generator ) == PSA_SUCCESS );
exit:
psa_generator_abort( &generator );
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Key derivation: test deriving a key from the KDF output
2018-07-12 17:29:22 +02:00
/* BEGIN_CASE */
void derive_key_exercise( int alg_arg,
data_t *key_data,
data_t *salt,
data_t *label,
int derived_type_arg,
int derived_bits_arg,
int derived_usage_arg,
int derived_alg_arg )
{
psa_key_slot_t base_key = 1;
psa_key_slot_t derived_key = 2;
psa_algorithm_t alg = alg_arg;
psa_key_type_t derived_type = derived_type_arg;
size_t derived_bits = derived_bits_arg;
psa_key_usage_t derived_usage = derived_usage_arg;
psa_algorithm_t derived_alg = derived_alg_arg;
size_t capacity = PSA_BITS_TO_BYTES( derived_bits );
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
psa_key_policy_t policy;
psa_key_type_t got_type;
size_t got_bits;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DERIVE, alg );
TEST_ASSERT( psa_set_key_policy( base_key, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( base_key, PSA_KEY_TYPE_DERIVE,
key_data->x,
key_data->len ) == PSA_SUCCESS );
/* Derive a key. */
TEST_ASSERT( psa_key_derivation( &generator, base_key, alg,
salt->x, salt->len,
label->x, label->len,
capacity ) == PSA_SUCCESS );
psa_key_policy_set_usage( &policy, derived_usage, derived_alg );
TEST_ASSERT( psa_set_key_policy( derived_key, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_import_key( derived_key,
derived_type,
derived_bits,
&generator ) == PSA_SUCCESS );
/* Test the key information */
TEST_ASSERT( psa_get_key_information( derived_key,
&got_type,
&got_bits ) == PSA_SUCCESS );
TEST_ASSERT( got_type == derived_type );
TEST_ASSERT( got_bits == derived_bits );
/* Exercise the derived key. */
if( ! exercise_key( derived_key, derived_usage, derived_alg ) )
goto exit;
exit:
psa_generator_abort( &generator );
psa_destroy_key( base_key );
psa_destroy_key( derived_key );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void derive_key_export( int alg_arg,
data_t *key_data,
data_t *salt,
data_t *label,
int bytes1_arg,
int bytes2_arg )
{
psa_key_slot_t base_key = 1;
psa_key_slot_t derived_key = 2;
psa_algorithm_t alg = alg_arg;
size_t bytes1 = bytes1_arg;
size_t bytes2 = bytes2_arg;
size_t capacity = bytes1 + bytes2;
psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
uint8_t *output_buffer = NULL;
uint8_t *export_buffer = NULL;
Key derivation: test deriving a key from the KDF output
2018-07-12 17:29:22 +02:00
psa_key_policy_t policy;
size_t length;
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output_buffer, capacity );
ASSERT_ALLOC( export_buffer, capacity );
Key derivation: test deriving a key from the KDF output
2018-07-12 17:29:22 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DERIVE, alg );
TEST_ASSERT( psa_set_key_policy( base_key, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( base_key, PSA_KEY_TYPE_DERIVE,
key_data->x,
key_data->len ) == PSA_SUCCESS );
/* Derive some material and output it. */
TEST_ASSERT( psa_key_derivation( &generator, base_key, alg,
salt->x, salt->len,
label->x, label->len,
capacity ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_read( &generator,
output_buffer,
capacity ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_abort( &generator ) == PSA_SUCCESS );
/* Derive the same output again, but this time store it in key objects. */
TEST_ASSERT( psa_key_derivation( &generator, base_key, alg,
salt->x, salt->len,
label->x, label->len,
capacity ) == PSA_SUCCESS );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT, 0 );
TEST_ASSERT( psa_set_key_policy( derived_key, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_import_key( derived_key,
PSA_KEY_TYPE_RAW_DATA,
PSA_BYTES_TO_BITS( bytes1 ),
&generator ) == PSA_SUCCESS );
TEST_ASSERT( psa_export_key( derived_key,
export_buffer, bytes1,
&length ) == PSA_SUCCESS );
TEST_ASSERT( length == bytes1 );
TEST_ASSERT( psa_destroy_key( derived_key ) == PSA_SUCCESS );
TEST_ASSERT( psa_set_key_policy( derived_key, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_import_key( derived_key,
PSA_KEY_TYPE_RAW_DATA,
PSA_BYTES_TO_BITS( bytes2 ),
&generator ) == PSA_SUCCESS );
TEST_ASSERT( psa_export_key( derived_key,
export_buffer + bytes1, bytes2,
&length ) == PSA_SUCCESS );
TEST_ASSERT( length == bytes2 );
/* Compare the outputs from the two runs. */
TEST_ASSERT( memcmp( output_buffer, export_buffer, capacity ) == 0 );
exit:
mbedtls_free( output_buffer );
mbedtls_free( export_buffer );
psa_generator_abort( &generator );
psa_destroy_key( base_key );
psa_destroy_key( derived_key );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
/* BEGIN_CASE */
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
void generate_random( int bytes_arg )
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
{
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
size_t bytes = bytes_arg;
const unsigned char trail[] = "don't overwrite me";
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
unsigned char *output = NULL;
unsigned char *changed = NULL;
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
size_t i;
unsigned run;
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
Use ASSERT_ALLOC instead of mbedtls_calloc in PSA tests This commit resolves a bug whereby some test cases failed on systems where mbedtls_calloc returns NULL when the size of 0, because the test case asserted `pointer != NULL` regardless of the size.
2018-09-27 13:54:18 +02:00
ASSERT_ALLOC( output, bytes + sizeof( trail ) );
ASSERT_ALLOC( changed, bytes );
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
memcpy( output + bytes, trail, sizeof( trail ) );
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
/* Run several times, to ensure that every output byte will be
* nonzero at least once with overwhelming probability
* (2^(-8*number_of_runs)). */
for( run = 0; run < 10; run++ )
{
Skip calling memset when the size is 0 memset(NULL, c, 0) has undefined behavior, so don't do it. clang-asan complains.
2018-09-26 18:19:24 +02:00
if( bytes != 0 )
memset( output, 0, bytes );
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
TEST_ASSERT( psa_generate_random( output, bytes ) == PSA_SUCCESS );
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
/* Check that no more than bytes have been overwritten */
TEST_ASSERT( memcmp( output + bytes, trail, sizeof( trail ) ) == 0 );
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
for( i = 0; i < bytes; i++ )
{
if( output[i] != 0 )
++changed[i];
}
}
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
/* Check that every byte was changed to nonzero at least once. This
* validates that psa_generate_random is overwriting every byte of
* the output buffer. */
for( i = 0; i < bytes; i++ )
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
{
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
TEST_ASSERT( changed[i] != 0 );
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
}
exit:
mbedtls_psa_crypto_free( );
test of generate_random: focus on testing the output buffer size In the test generate_random, focus on testing that psa_generate_random is writing all the bytes of the output buffer and no more. Add a check that it is writing to each byte of the output buffer. Do not try to look for repeating output as the structure of a unit test isn't likely to catch that sort of problem anyway.
2018-06-21 10:22:13 +02:00
mbedtls_free( output );
mbedtls_free( changed );
Implement psa_generate_random
2018-06-19 22:00:52 +02:00
}
/* END_CASE */
Implement psa_generate_key: AES, DES, RSA, ECP In the test cases, try exporting the generated key and perform sanity checks on it.
2018-06-20 00:20:32 +02:00
/* BEGIN_CASE */
void generate_key( int type_arg,
int bits_arg,
int usage_arg,
int alg_arg,
int expected_status_arg )
{
int slot = 1;
psa_key_type_t type = type_arg;
psa_key_usage_t usage = usage_arg;
size_t bits = bits_arg;
psa_algorithm_t alg = alg_arg;
psa_status_t expected_status = expected_status_arg;
psa_key_type_t got_type;
size_t got_bits;
psa_status_t expected_info_status =
expected_status == PSA_SUCCESS ? PSA_SUCCESS : PSA_ERROR_EMPTY_SLOT;
psa_key_policy_t policy;
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, usage, alg );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
/* Generate a key */
TEST_ASSERT( psa_generate_key( slot, type, bits,
NULL, 0 ) == expected_status );
/* Test the key information */
TEST_ASSERT( psa_get_key_information( slot,
&got_type,
&got_bits ) == expected_info_status );
if( expected_info_status != PSA_SUCCESS )
goto exit;
TEST_ASSERT( got_type == type );
TEST_ASSERT( got_bits == bits );
generate_key tests: exercise the key After generating a key, perform a smoke test: run one operation with it and check that the operation has the expected status.
2018-06-20 18:16:48 +02:00
/* Do something with the key according to its type and permitted usage. */
Factor duplicated code into exercise_key Also fail the test if the test code lacks a way to exercise the key.
2018-07-01 22:31:34 +02:00
if( ! exercise_key( slot, usage, alg ) )
goto exit;
Implement psa_generate_key: AES, DES, RSA, ECP In the test cases, try exporting the generated key and perform sanity checks on it.
2018-06-20 00:20:32 +02:00
exit:
psa_destroy_key( slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */
Ensure the module is initialized in psa_generate_random
2018-09-06 15:24:41 +02:00
/* BEGIN_CASE */
void validate_module_init_generate_random( )
{
psa_status_t status;
uint8_t random[10] = { 0 };
status = psa_generate_random( random, sizeof( random ) );
TEST_ASSERT( status == PSA_ERROR_BAD_STATE );
}
/* END_CASE */
Ensure the module is initialized in key based functions
2018-09-12 10:44:52 +02:00
/* BEGIN_CASE */
void validate_module_init_key_based( )
{
psa_status_t status;
uint8_t data[10] = { 0 };
status = psa_import_key( 1, PSA_KEY_TYPE_RAW_DATA, data, sizeof( data ) );
TEST_ASSERT( status == PSA_ERROR_BAD_STATE );
}
/* END_CASE */
Reference in New Issue Copy Permalink