Skip to content

Commit

Permalink
Dispatch hashing calls through the driver wrapper layer
Browse files Browse the repository at this point in the history 
Signed-off-by: Steven Cooreman <[email protected]>
  • Loading branch information
@stevew817
stevew817 committed Feb 18, 2021
1 parent 38fba79 commit f42635b
Show file tree
Hide file tree
Showing 4 changed files with 280 additions and 55 deletions.
73 changes: 22 additions & 51 deletions library/psa_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "psa_crypto_invasive.h"
#include "psa_crypto_driver_wrappers.h"
#include "psa_crypto_ecp.h"
#include "psa_crypto_hash.h"
#include "psa_crypto_rsa.h"
#include "psa_crypto_ecp.h"
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
Expand Down Expand Up @@ -1976,41 +1975,18 @@ static const mbedtls_md_info_t *mbedtls_md_info_from_psa( psa_algorithm_t alg )
psa_status_t psa_hash_abort( psa_hash_operation_t *operation )
{
if( operation != NULL )
{
if( operation->ctx.ctx != NULL )
{
psa_status_t status = mbedtls_psa_hash_abort( operation->ctx.ctx );
mbedtls_free( operation->ctx.ctx );
operation->ctx.ctx = NULL;
return( status );
}
else
{
// Multiple consequent calls to abort return success
return( PSA_SUCCESS );
}
}
return( psa_driver_wrapper_hash_abort( &operation->ctx ) );
else
return( PSA_ERROR_INVALID_ARGUMENT );
}

psa_status_t psa_hash_setup( psa_hash_operation_t *operation,
psa_algorithm_t alg )
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;

if( operation == NULL || !PSA_ALG_IS_HASH( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );

/* A context must be freshly initialized before it can be set up. */
if( operation->ctx.ctx != NULL )
return( PSA_ERROR_BAD_STATE );

operation->ctx.ctx = mbedtls_calloc( 1, sizeof(mbedtls_psa_hash_operation_t) );
status = mbedtls_psa_hash_setup( operation->ctx.ctx, alg );
if( status != PSA_SUCCESS )
psa_hash_abort( operation );
return( status );
return( psa_driver_wrapper_hash_setup( &operation->ctx, alg ) );
}

psa_status_t psa_hash_update( psa_hash_operation_t *operation,
Expand All @@ -2019,14 +1995,9 @@ psa_status_t psa_hash_update( psa_hash_operation_t *operation,
{
if( operation == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );
if( operation->ctx.ctx == NULL )
return( PSA_ERROR_BAD_STATE );

psa_status_t status = mbedtls_psa_hash_update( operation->ctx.ctx,
input, input_length );
if( status != PSA_SUCCESS )
psa_hash_abort( operation );
return( status );
return( psa_driver_wrapper_hash_update( &operation->ctx,
input, input_length ) );
}

psa_status_t psa_hash_finish( psa_hash_operation_t *operation,
Expand All @@ -2036,11 +2007,10 @@ psa_status_t psa_hash_finish( psa_hash_operation_t *operation,
{
if( operation == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );
if( operation->ctx.ctx == NULL )
return( PSA_ERROR_BAD_STATE );

psa_status_t status = mbedtls_psa_hash_finish( operation->ctx.ctx,
hash, hash_size, hash_length );
psa_status_t status = psa_driver_wrapper_hash_finish(
&operation->ctx,
hash, hash_size, hash_length );
psa_hash_abort( operation );
return( status );
}
Expand All @@ -2049,11 +2019,15 @@ psa_status_t psa_hash_verify( psa_hash_operation_t *operation,
const uint8_t *hash,
size_t hash_length )
{
if( operation == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );

uint8_t actual_hash[MBEDTLS_MD_MAX_SIZE];
size_t actual_hash_length;
psa_status_t status = psa_hash_finish( operation,
actual_hash, sizeof( actual_hash ),
&actual_hash_length );
psa_status_t status = psa_driver_wrapper_hash_finish(
&operation->ctx,
actual_hash, sizeof( actual_hash ),
&actual_hash_length );
if( status != PSA_SUCCESS )
return( status );
if( actual_hash_length != hash_length )
Expand All @@ -2068,8 +2042,8 @@ psa_status_t psa_hash_compute( psa_algorithm_t alg,
uint8_t *hash, size_t hash_size,
size_t *hash_length )
{
return( mbedtls_psa_hash_compute( alg, input, input_length,
hash, hash_size, hash_length ) );
return( psa_driver_wrapper_hash_compute( alg, input, input_length,
hash, hash_size, hash_length ) );
}

psa_status_t psa_hash_compare( psa_algorithm_t alg,
Expand All @@ -2078,9 +2052,10 @@ psa_status_t psa_hash_compare( psa_algorithm_t alg,
{
uint8_t actual_hash[MBEDTLS_MD_MAX_SIZE];
size_t actual_hash_length;
psa_status_t status = psa_hash_compute( alg, input, input_length,
actual_hash, sizeof(actual_hash),
&actual_hash_length );
psa_status_t status = psa_driver_wrapper_hash_compute(
alg, input, input_length,
actual_hash, sizeof(actual_hash),
&actual_hash_length );
if( status != PSA_SUCCESS )
return( status );
if( actual_hash_length != hash_length )
Expand All @@ -2095,13 +2070,9 @@ psa_status_t psa_hash_clone( const psa_hash_operation_t *source_operation,
{
if( source_operation == NULL || target_operation == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );
if( source_operation->ctx.ctx == NULL )
return( PSA_ERROR_BAD_STATE );
if( target_operation->ctx.ctx != NULL )
return( PSA_ERROR_BAD_STATE );

target_operation->ctx.ctx = mbedtls_calloc(1, sizeof(mbedtls_psa_hash_operation_t));
return( mbedtls_psa_hash_clone( source_operation->ctx.ctx, target_operation->ctx.ctx ) );
return( psa_driver_wrapper_hash_clone( &source_operation->ctx,
&target_operation->ctx ) );
}


Expand Down
217 changes: 213 additions & 4 deletions library/psa_crypto_driver_wrappers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,17 @@

/* Repeat above block for each JSON-declared driver during autogeneration */

/* Auto-generated values depending on which drivers are registered. ID 0 is
* reserved for unallocated operations. */
/* Auto-generated values depending on which drivers are registered.
* ID 0 is reserved for unallocated operations.
* ID 1 is reserved for the Mbed TLS software driver. */
#if defined(PSA_CRYPTO_DRIVER_TEST)
#define PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID (1)
#define PSA_CRYPTO_OPAQUE_TEST_DRIVER_ID (2)
#define PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID (2)
#define PSA_CRYPTO_OPAQUE_TEST_DRIVER_ID (3)
#endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* MBEDTLS_PSA_CRYPTO_DRIVERS */

#define PSA_CRYPTO_MBED_TLS_DRIVER_ID (1)

/* Support the 'old' SE interface when asked to */
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
/* PSA_CRYPTO_DRIVER_PRESENT is defined when either a new-style or old-style
Expand All @@ -56,6 +59,9 @@
#include "psa_crypto_se.h"
#endif

/* Include software fallback when present */
#include "psa_crypto_hash.h"

/* Start delegation functions */
psa_status_t psa_driver_wrapper_sign_hash( psa_key_slot_t *slot,
psa_algorithm_t alg,
Expand Down Expand Up @@ -1082,4 +1088,207 @@ psa_status_t psa_driver_wrapper_cipher_abort(
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}

/*
* Hashing functions
*/
psa_status_t psa_driver_wrapper_hash_compute(
psa_algorithm_t alg,
const uint8_t *input,
size_t input_length,
uint8_t *hash,
size_t hash_size,
size_t *hash_length)
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

/* Try accelerators first */

/* If software fallback is compiled in, try fallback */
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
status = mbedtls_psa_hash_compute( alg, input, input_length,
hash, hash_size, hash_length );
if( status != PSA_ERROR_NOT_SUPPORTED )
return( status );
#endif
if( status == PSA_ERROR_NOT_SUPPORTED )
{
(void) alg;
(void) input;
(void) input_length;
(void) hash;
(void) hash_size;
(void) hash_length;

return( PSA_ERROR_NOT_SUPPORTED );
}
return( status );
}

psa_status_t psa_driver_wrapper_hash_setup(
psa_operation_driver_context_t *operation,
psa_algorithm_t alg )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

/* A context must be freshly initialized before it can be set up. */
if( operation->id != 0 || operation->ctx != NULL )
return( PSA_ERROR_BAD_STATE );

/* Try setup on accelerators first */

/* If software fallback is compiled in, try fallback */
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
operation->ctx = mbedtls_calloc( 1, sizeof(mbedtls_psa_hash_operation_t) );
status = mbedtls_psa_hash_setup( operation->ctx, alg );
if( status == PSA_SUCCESS )
{
operation->id = PSA_CRYPTO_MBED_TLS_DRIVER_ID;
}
else
{
mbedtls_free( operation->ctx );
operation->ctx = NULL;
operation->id = 0;
}

if( status != PSA_ERROR_NOT_SUPPORTED )
return( status );
#endif
/* Nothing left to try if we fall through here */
(void) status;
(void) operation;
(void) alg;
return( PSA_ERROR_NOT_SUPPORTED );
}

psa_status_t psa_driver_wrapper_hash_clone(
const psa_operation_driver_context_t *source_operation,
psa_operation_driver_context_t *target_operation )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

if( source_operation->ctx == NULL || source_operation->id == 0 )
return( PSA_ERROR_BAD_STATE );
if( target_operation->ctx != NULL || target_operation->id != 0 )
return( PSA_ERROR_BAD_STATE );

switch( source_operation->id )
{
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
target_operation->ctx = mbedtls_calloc( 1, sizeof(mbedtls_psa_hash_operation_t) );
if( target_operation->ctx == NULL )
{
status = PSA_ERROR_INSUFFICIENT_MEMORY;
break;
}
target_operation->id = PSA_CRYPTO_MBED_TLS_DRIVER_ID;
status = mbedtls_psa_hash_clone( source_operation->ctx,
target_operation->ctx );
break;
#endif
default:
(void) status;
(void) source_operation;
(void) target_operation;
return( PSA_ERROR_BAD_STATE );
}

if( status != PSA_SUCCESS )
psa_driver_wrapper_hash_abort( target_operation );
return( status );
}

psa_status_t psa_driver_wrapper_hash_update(
psa_operation_driver_context_t *operation,
const uint8_t *input,
size_t input_length )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

if( operation->ctx == NULL || operation->id == 0 )
return( PSA_ERROR_BAD_STATE );

switch( operation->id )
{
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
status = mbedtls_psa_hash_update( operation->ctx,
input, input_length );
break;
#endif
default:
(void) status;
(void) operation;
(void) input;
(void) input_length;
return( PSA_ERROR_BAD_STATE );
}

if( status != PSA_SUCCESS )
psa_driver_wrapper_hash_abort( operation );
return( status );
}

psa_status_t psa_driver_wrapper_hash_finish(
psa_operation_driver_context_t *operation,
uint8_t *hash,
size_t hash_size,
size_t *hash_length )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

if( operation->ctx == NULL || operation->id == 0 )
return( PSA_ERROR_BAD_STATE );

switch( operation->id )
{
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
status = mbedtls_psa_hash_finish( operation->ctx,
hash, hash_size, hash_length );
break;
#endif
default:
(void) status;
(void) operation;
(void) hash;
(void) hash_size;
(void) hash_length;
return( PSA_ERROR_BAD_STATE );
}

psa_driver_wrapper_hash_abort( operation );
return( status );
}

psa_status_t psa_driver_wrapper_hash_abort(
psa_operation_driver_context_t *operation )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;

switch( operation->id )
{
case 0:
if( operation->ctx == NULL )
return( PSA_SUCCESS );
else
return( PSA_ERROR_BAD_STATE );
#if defined(MBEDTLS_PSA_BUILTIN_HASH)
case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
if( operation->ctx != NULL )
{
status = mbedtls_psa_hash_abort( operation->ctx );
mbedtls_free( operation->ctx );
operation->ctx = NULL;
}
operation->id = 0;
return( PSA_SUCCESS );
#endif
default:
(void) status;
return( PSA_ERROR_BAD_STATE );
}
}

/* End of automatically generated file. */
Loading

0 comments on commit f42635b

Please sign in to comment.