mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-02 07:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update LMS local variable allocation

Browse Source 
To use a default failure value, and to avoid a call to
psa_hash_operation_init()

Signed-off-by: Raef Coles <raef.coles@arm.com>
This commit is contained in:
Raef Coles 2022-10-07 11:27:35 +01:00
parent 2ac352a322
commit be0c2f9183
No known key found for this signature in database
GPG Key ID: 1AAF1B43DF2086F4
2 changed files with 10 additions and 16 deletions

22
library/lmots.c

@ -152,13 +152,12 @@ static int create_digit_array_with_checksum( const mbedtls_lmots_parameters_t *p
const unsigned char *C_random_value, const unsigned char *C_random_value,
unsigned char *out ) unsigned char *out )
{ {
psa_hash_operation_t op; psa_hash_operation_t op = PSA_HASH_OPERATION_INIT;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
unsigned short checksum; unsigned short checksum;
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
op = psa_hash_operation_init( );
status = psa_hash_setup( &op, PSA_ALG_SHA_256 ); status = psa_hash_setup( &op, PSA_ALG_SHA_256 );
ret = mbedtls_lms_error_from_psa( status ); ret = mbedtls_lms_error_from_psa( status );
if( ret != 0 ) if( ret != 0 )
@ -250,14 +249,12 @@ static int hash_digit_array( const mbedtls_lmots_parameters_t *params,
unsigned char j_hash_idx_bytes[J_HASH_IDX_LEN]; unsigned char j_hash_idx_bytes[J_HASH_IDX_LEN];
unsigned int j_hash_idx_min; unsigned int j_hash_idx_min;
unsigned int j_hash_idx_max; unsigned int j_hash_idx_max;
psa_hash_operation_t op; psa_hash_operation_t op = PSA_HASH_OPERATION_INIT;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
unsigned char tmp_hash[MBEDTLS_LMOTS_N_HASH_LEN_MAX]; unsigned char tmp_hash[MBEDTLS_LMOTS_N_HASH_LEN_MAX];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
op = psa_hash_operation_init( );
for ( i_digit_idx = 0; for ( i_digit_idx = 0;
i_digit_idx < MBEDTLS_LMOTS_P_SIG_DIGIT_COUNT(params->type); i_digit_idx < MBEDTLS_LMOTS_P_SIG_DIGIT_COUNT(params->type);
i_digit_idx++ ) i_digit_idx++ )
@ -361,12 +358,11 @@ static int public_key_from_hashed_digit_array( const mbedtls_lmots_parameters_t
const unsigned char *y_hashed_digits, const unsigned char *y_hashed_digits,
unsigned char *pub_key ) unsigned char *pub_key )
{ {
psa_hash_operation_t op; psa_hash_operation_t op = PSA_HASH_OPERATION_INIT;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
op = psa_hash_operation_init( );
status = psa_hash_setup( &op, PSA_ALG_SHA_256 ); status = psa_hash_setup( &op, PSA_ALG_SHA_256 );
ret = mbedtls_lms_error_from_psa( status ); ret = mbedtls_lms_error_from_psa( status );
if( ret != 0 ) if( ret != 0 )
@ -587,8 +583,8 @@ int mbedtls_lmots_generate_private_key( mbedtls_lmots_private_t *ctx,
const unsigned char *seed, const unsigned char *seed,
size_t seed_size ) size_t seed_size )
{ {
psa_hash_operation_t op; psa_hash_operation_t op = PSA_HASH_OPERATION_INIT;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
unsigned int i_digit_idx; unsigned int i_digit_idx;
unsigned char i_digit_idx_bytes[2]; unsigned char i_digit_idx_bytes[2];
@ -605,8 +601,6 @@ int mbedtls_lmots_generate_private_key( mbedtls_lmots_private_t *ctx,
return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA ); return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
} }
op = psa_hash_operation_init( );
ctx->params.type = type; ctx->params.type = type;
memcpy( ctx->params.I_key_identifier, memcpy( ctx->params.I_key_identifier,

4
library/lms.c

@ -107,7 +107,7 @@ static int create_merkle_leaf_value( const mbedtls_lms_parameters_t *params,
unsigned char *out ) unsigned char *out )
{ {
psa_hash_operation_t op; psa_hash_operation_t op;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
unsigned char r_node_idx_bytes[4]; unsigned char r_node_idx_bytes[4];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -182,7 +182,7 @@ static int create_merkle_internal_value( const mbedtls_lms_parameters_t *params,
unsigned char *out ) unsigned char *out )
{ {
psa_hash_operation_t op; psa_hash_operation_t op;
psa_status_t status; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t output_hash_len; size_t output_hash_len;
unsigned char r_node_idx_bytes[4]; unsigned char r_node_idx_bytes[4];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;