From 06aa442beffcc5f6090ccba6883e826e906c1b90 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 9 Mar 2021 17:32:57 +0100 Subject: [PATCH] psa: cipher: Remove unused `key_set` operation field Signed-off-by: Ronald Cron --- include/psa/crypto_struct.h | 3 +-- library/psa_crypto.c | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h index 87eefb9b1..3ccad24cd 100644 --- a/include/psa/crypto_struct.h +++ b/include/psa/crypto_struct.h @@ -144,7 +144,6 @@ static inline struct psa_mac_operation_s psa_mac_operation_init( void ) struct psa_cipher_operation_s { psa_algorithm_t alg; - unsigned int key_set : 1; unsigned int iv_required : 1; unsigned int iv_set : 1; unsigned int mbedtls_in_use : 1; /* Indicates mbed TLS is handling the operation. */ @@ -158,7 +157,7 @@ struct psa_cipher_operation_s } ctx; }; -#define PSA_CIPHER_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, {0}} +#define PSA_CIPHER_OPERATION_INIT {0, 0, 0, 0, 0, 0, {0}} static inline struct psa_cipher_operation_s psa_cipher_operation_init( void ) { const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT; diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 22dce5d7f..3dfee3b3c 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -3408,7 +3408,6 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation, /* Initialize the operation struct members, except for alg. The alg member * is used to indicate to psa_cipher_abort that there are resources to free, * so we only set it after resources have been allocated/initialized. */ - operation->key_set = 0; operation->iv_set = 0; operation->mbedtls_in_use = 0; operation->iv_size = 0; @@ -3444,12 +3443,7 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation, } exit: - if( status == PSA_SUCCESS ) - { - /* Update operation flags for both driver and software implementations */ - operation->key_set = 1; - } - else + if( status != PSA_SUCCESS ) psa_cipher_abort( operation ); unlock_status = psa_unlock_key_slot( slot ); @@ -3607,7 +3601,6 @@ psa_status_t psa_cipher_abort( psa_cipher_operation_t *operation ) psa_driver_wrapper_cipher_abort( operation ); operation->alg = 0; - operation->key_set = 0; operation->iv_set = 0; operation->mbedtls_in_use = 0; operation->iv_size = 0;