AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a working implementation of a multipart AES-CTR test driver

Browse Source 
Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman 2020-09-03 15:30:32 +02:00
parent 3ec4018e2b
commit 8b12225717
2 changed files with 246 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
library/psa_crypto.c
View File

@ -4217,10 +4217,13 @@ psa_status_t psa_cipher_generate_iv( psa_cipher_operation_t *operation,
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( operation->accelerator_set == 1 )
return( psa_driver_wrapper_cipher_generate_iv( operation,
{
status = psa_driver_wrapper_cipher_generate_iv( operation,
iv,
iv_size,
iv_length ) );
iv_length );
goto exit;
}
if( operation->iv_set || ! operation->iv_required || ! operation->key_set )
{
@ -4256,9 +4259,12 @@ psa_status_t psa_cipher_set_iv( psa_cipher_operation_t *operation,
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( operation->accelerator_set == 1 )
return( psa_driver_wrapper_cipher_set_iv( operation,
{
status = psa_driver_wrapper_cipher_set_iv( operation,
iv,
iv_length ) );
iv_length );
goto exit;
}
if( operation->iv_set || ! operation->iv_required || ! operation->key_set )
{
@ -4378,12 +4384,15 @@ psa_status_t psa_cipher_update( psa_cipher_operation_t *operation,
size_t expected_output_size;
if( operation->accelerator_set == 1 )
return( psa_driver_wrapper_cipher_update( operation,
{
status = psa_driver_wrapper_cipher_update( operation,
input,
input_length,
output,
output_size,
output_length ) );
output_length );
goto exit;
}
if( operation->alg == 0 || ! operation->key_set )
{
@ -4445,10 +4454,17 @@ psa_status_t psa_cipher_finish( psa_cipher_operation_t *operation,
uint8_t temp_output_buffer[MBEDTLS_MAX_BLOCK_LENGTH];
if( operation->accelerator_set == 1 )
return( psa_driver_wrapper_cipher_finish( operation,
{
status = psa_driver_wrapper_cipher_finish( operation,
output,
output_size,
output_length ) );
output_length );
if( status != PSA_SUCCESS )
goto error;
(void) psa_cipher_abort( operation );
return( status );
}
if( ! operation->key_set )
{

242
tests/src/drivers/cipher.c
View File

@ -38,9 +38,12 @@
void *test_driver_cipher_forced_output = NULL;
size_t test_driver_cipher_forced_output_length = 0;
/* Test driver, if not explicitly setup, returns 'PSA_ERROR_NOT_SUPPORTED' by default,
* causing regular test suites to pass since the core will go into fallback mode. */
psa_status_t test_transparent_cipher_status = PSA_ERROR_NOT_SUPPORTED;
/* Test driver implements AES-CTR by default when it's status is not overridden.
* Set test_transparent_cipher_status to PSA_ERROR_NOT_SUPPORTED to use fallback
* even for AES-CTR.
* Keep in mind this code is only exercised during the crypto drivers test target,
* meaning the other test runs will still test only the non-driver implementation. */
psa_status_t test_transparent_cipher_status = PSA_SUCCESS;
unsigned long test_transparent_cipher_hit = 0;
psa_status_t test_transparent_cipher_encrypt(
@ -101,16 +104,57 @@ psa_status_t test_transparent_cipher_encrypt_setup(
const uint8_t *key, size_t key_length,
psa_algorithm_t alg)
{
(void) attributes;
(void) key;
(void) key_length;
(void) alg;
/* write our struct, this will trigger memory corruption failures
* in test when we go outside of bounds. */
memset(operation, 0, sizeof(test_transparent_cipher_operation_t));
const mbedtls_cipher_info_t *cipher_info = NULL;
int ret = 0;
test_transparent_cipher_hit++;
if( operation->alg != 0 )
return PSA_ERROR_BAD_STATE;
/* write our struct, this will trigger memory corruption failures
* in test when we go outside of bounds, or when the function is called
* without first destroying the context object. */
memset(operation, 0, sizeof(test_transparent_cipher_operation_t));
/* Test driver supports AES-CTR only, to verify operation calls. */
if( alg != PSA_ALG_CTR || psa_get_key_type( attributes ) != PSA_KEY_TYPE_AES )
return PSA_ERROR_NOT_SUPPORTED;
operation->alg = alg;
operation->iv_size = 16;
operation->block_size = 16;
cipher_info = mbedtls_cipher_info_from_values( MBEDTLS_CIPHER_ID_AES,
key_length * 8,
MBEDTLS_MODE_CTR );
if( cipher_info == NULL )
return PSA_ERROR_NOT_SUPPORTED;
mbedtls_cipher_init( &operation->cipher );
ret = mbedtls_cipher_setup( &operation->cipher, cipher_info );
if( ret != 0 ) {
mbedtls_cipher_free( &operation->cipher );
return mbedtls_to_psa_error( ret );
}
ret = mbedtls_cipher_setkey( &operation->cipher,
key,
key_length * 8, MBEDTLS_ENCRYPT );
if( ret != 0 ) {
mbedtls_cipher_free( &operation->cipher );
return mbedtls_to_psa_error( ret );
}
operation->iv_set = 0;
operation->iv_required = 1;
operation->key_set = 1;
/* Allow overriding return value for testing purposes */
if( test_transparent_cipher_status != PSA_SUCCESS )
mbedtls_cipher_free( &operation->cipher );
return test_transparent_cipher_status;
}
@ -120,28 +164,72 @@ psa_status_t test_transparent_cipher_decrypt_setup(
const uint8_t *key, size_t key_length,
psa_algorithm_t alg)
{
(void) attributes;
(void) key;
(void) key_length;
(void) alg;
/* write our struct, this will trigger memory corruption failures
* in test when we go outside of bounds. */
memset(operation, 0, sizeof(test_transparent_cipher_operation_t));
const mbedtls_cipher_info_t *cipher_info = NULL;
int ret = 0;
test_transparent_cipher_hit++;
if( operation->alg != 0 )
return PSA_ERROR_BAD_STATE;
/* write our struct, this will trigger memory corruption failures
* in test when we go outside of bounds, or when the function is called
* without first destroying the context object. */
memset(operation, 0, sizeof(test_transparent_cipher_operation_t));
/* Test driver supports AES-CTR only, to verify operation calls. */
if( alg != PSA_ALG_CTR || psa_get_key_type( attributes ) != PSA_KEY_TYPE_AES )
return PSA_ERROR_NOT_SUPPORTED;
operation->alg = alg;
operation->iv_size = 16;
operation->block_size = 16;
mbedtls_cipher_init( &operation->cipher );
cipher_info = mbedtls_cipher_info_from_values( MBEDTLS_CIPHER_ID_AES,
key_length * 8,
MBEDTLS_MODE_CTR );
if( cipher_info == NULL )
return PSA_ERROR_NOT_SUPPORTED;
ret = mbedtls_cipher_setup( &operation->cipher, cipher_info );
if( ret != 0 )
return mbedtls_to_psa_error( ret );
ret = mbedtls_cipher_setkey( &operation->cipher,
key,
key_length * 8, MBEDTLS_DECRYPT );
if( ret != 0 )
return mbedtls_to_psa_error( ret );
operation->iv_set = 0;
operation->iv_required = 1;
operation->key_set = 1;
/* Allow overriding return value for testing purposes */
if( test_transparent_cipher_status != PSA_SUCCESS )
mbedtls_cipher_free( &operation->cipher );
return test_transparent_cipher_status;
}
psa_status_t test_transparent_cipher_abort(
test_transparent_cipher_operation_t *operation)
{
if( operation->alg == 0 )
return( PSA_SUCCESS );
if( operation->alg != PSA_ALG_CTR )
return( PSA_ERROR_BAD_STATE );
mbedtls_cipher_free( &operation->cipher );
/* write our struct, this will trigger memory corruption failures
* in test when we go outside of bounds. */
memset(operation, 0, sizeof(test_transparent_cipher_operation_t));
test_transparent_cipher_hit++;
return test_transparent_cipher_status;
return PSA_SUCCESS;
}
psa_status_t test_transparent_cipher_generate_iv(
@ -150,13 +238,32 @@ psa_status_t test_transparent_cipher_generate_iv(
size_t iv_size,
size_t *iv_length)
{
(void) operation;
(void) iv;
(void) iv_size;
(void) iv_length;
psa_status_t status;
mbedtls_test_rnd_pseudo_info rnd_info;
memset( &rnd_info, 0x5A, sizeof( mbedtls_test_rnd_pseudo_info ) );
test_transparent_cipher_hit++;
return test_transparent_cipher_status;
if( operation->alg != PSA_ALG_CTR )
return( PSA_ERROR_BAD_STATE );
if( operation->iv_set || ! operation->iv_required )
return( PSA_ERROR_BAD_STATE );
if( iv_size < operation->iv_size )
return( PSA_ERROR_BUFFER_TOO_SMALL );
status = mbedtls_to_psa_error(
mbedtls_test_rnd_pseudo_rand( &rnd_info,
iv,
operation->iv_size ) );
if( status != PSA_SUCCESS )
return status;
*iv_length = operation->iv_size;
status = test_transparent_cipher_set_iv( operation, iv, *iv_length );
return status;
}
psa_status_t test_transparent_cipher_set_iv(
@ -164,12 +271,26 @@ psa_status_t test_transparent_cipher_set_iv(
const uint8_t *iv,
size_t iv_length)
{
(void) operation;
(void) iv;
(void) iv_length;
psa_status_t status;
test_transparent_cipher_hit++;
return test_transparent_cipher_status;
if( operation->alg != PSA_ALG_CTR )
return PSA_ERROR_BAD_STATE;
if( operation->iv_set || ! operation->iv_required )
return( PSA_ERROR_BAD_STATE );
if( iv_length != operation->iv_size )
return( PSA_ERROR_INVALID_ARGUMENT );
status = mbedtls_to_psa_error(
mbedtls_cipher_set_iv( &operation->cipher, iv, iv_length ) );
if( status == PSA_SUCCESS )
operation->iv_set = 1;
return status;
}
psa_status_t test_transparent_cipher_update(
@ -180,18 +301,35 @@ psa_status_t test_transparent_cipher_update(
size_t output_size,
size_t *output_length)
{
(void) operation;
(void) input;
(void) input_length;
size_t expected_output_size;
psa_status_t status;
test_transparent_cipher_hit++;
if( test_transparent_cipher_status != PSA_SUCCESS )
return test_transparent_cipher_status;
if( operation->alg != PSA_ALG_CTR )
return( PSA_ERROR_BAD_STATE );
expected_output_size = ( operation->cipher.unprocessed_len + input_length )
/ operation->block_size * operation->block_size;
if( output_size < expected_output_size )
return( PSA_ERROR_BUFFER_TOO_SMALL );
status = mbedtls_to_psa_error(
mbedtls_cipher_update( &operation->cipher, input,
input_length, output, output_length ) );
if( status != PSA_SUCCESS )
return status;
if( test_driver_cipher_forced_output != NULL )
{
if( output_size < test_driver_cipher_forced_output_length )
return PSA_ERROR_BUFFER_TOO_SMALL;
memcpy(output, test_driver_cipher_forced_output, test_driver_cipher_forced_output_length);
*output_length = test_driver_cipher_forced_output_length;
}
return test_transparent_cipher_status;
}
@ -202,16 +340,46 @@ psa_status_t test_transparent_cipher_finish(
size_t output_size,
size_t *output_length)
{
(void) operation;
psa_status_t status = PSA_ERROR_GENERIC_ERROR;
uint8_t temp_output_buffer[MBEDTLS_MAX_BLOCK_LENGTH];
test_transparent_cipher_hit++;
if( test_transparent_cipher_status != PSA_SUCCESS )
return test_transparent_cipher_status;
if( operation->alg != PSA_ALG_CTR )
return( PSA_ERROR_BAD_STATE );
if( ! operation->key_set )
return( PSA_ERROR_BAD_STATE );
if( operation->iv_required && ! operation->iv_set )
return( PSA_ERROR_BAD_STATE );
status = mbedtls_to_psa_error(
mbedtls_cipher_finish( &operation->cipher,
temp_output_buffer,
output_length ) );
mbedtls_cipher_free( &operation->cipher );
if( status != PSA_SUCCESS )
return( status );
if( *output_length == 0 )
; /* Nothing to copy. Note that output may be NULL in this case. */
else if( output_size >= *output_length )
memcpy( output, temp_output_buffer, *output_length );
else
return( PSA_ERROR_BUFFER_TOO_SMALL );
if( test_driver_cipher_forced_output != NULL )
{
if( output_size < test_driver_cipher_forced_output_length )
return PSA_ERROR_BUFFER_TOO_SMALL;
memcpy(output, test_driver_cipher_forced_output, test_driver_cipher_forced_output_length);
*output_length = test_driver_cipher_forced_output_length;
}
return test_transparent_cipher_status;
}