diff options
| author | Dave Rodgman <dave.rodgman@arm.com> | 2023-09-28 19:33:15 +0100 |
|---|---|---|
| committer | Dave Rodgman <dave.rodgman@arm.com> | 2023-09-28 19:33:15 +0100 |
| commit | 3572bde9c9dd9a631b09b5bfdb05d09dfb2d129a (patch) | |
| tree | ebf82197d7a6ee6136b1605284b8cf50577e4913 /scripts/data_files | |
| parent | fe43d12f60f369c975f7dd8b2ac6d06d83b900ba (diff) | |
| download | mbedtls-3572bde9c9dd9a631b09b5bfdb05d09dfb2d129a.zip mbedtls-3572bde9c9dd9a631b09b5bfdb05d09dfb2d129a.tar.gz mbedtls-3572bde9c9dd9a631b09b5bfdb05d09dfb2d129a.tar.bz2 | |
Assume get_num_ops cannot fail
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
Diffstat (limited to 'scripts/data_files')
| -rw-r--r-- | scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja index 282dd7b..ded5c04 100644 --- a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja +++ b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja @@ -472,19 +472,17 @@ static inline psa_status_t psa_driver_wrapper_verify_hash( } } -static inline psa_status_t psa_driver_wrapper_sign_hash_get_num_ops( - psa_sign_hash_interruptible_operation_t *operation, uint32_t *num_ops ) +static inline uint32_t psa_driver_wrapper_sign_hash_get_num_ops( + psa_sign_hash_interruptible_operation_t *operation ) { switch( operation->id ) { /* If uninitialised, return 0, as no work can have been done. */ case 0: - *num_ops = 0; - return PSA_SUCCESS; + return 0; case PSA_CRYPTO_MBED_TLS_DRIVER_ID: - *num_ops = mbedtls_psa_sign_hash_get_num_ops(&operation->ctx.mbedtls_ctx); - return PSA_SUCCESS; + return(mbedtls_psa_sign_hash_get_num_ops(&operation->ctx.mbedtls_ctx)); #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_DRIVER_TEST) @@ -494,22 +492,21 @@ static inline psa_status_t psa_driver_wrapper_sign_hash_get_num_ops( #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ } - return( PSA_ERROR_INVALID_ARGUMENT ); + /* Can't happen (see discussion in #8271) */ + return 0; } -static inline psa_status_t psa_driver_wrapper_verify_hash_get_num_ops( - psa_verify_hash_interruptible_operation_t *operation, uint32_t *num_ops ) +static inline uint32_t psa_driver_wrapper_verify_hash_get_num_ops( + psa_verify_hash_interruptible_operation_t *operation ) { switch( operation->id ) { /* If uninitialised, return 0, as no work can have been done. */ case 0: - *num_ops = 0; - return PSA_SUCCESS; + return 0; case PSA_CRYPTO_MBED_TLS_DRIVER_ID: - *num_ops = mbedtls_psa_verify_hash_get_num_ops(&operation->ctx.mbedtls_ctx); - return PSA_SUCCESS; + return (mbedtls_psa_verify_hash_get_num_ops(&operation->ctx.mbedtls_ctx)); #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_DRIVER_TEST) @@ -520,7 +517,8 @@ static inline psa_status_t psa_driver_wrapper_verify_hash_get_num_ops( } - return ( PSA_ERROR_INVALID_ARGUMENT ); + /* Can't happen (see discussion in #8271) */ + return 0; } static inline psa_status_t psa_driver_wrapper_sign_hash_start( |