Move hidden logic into loop 'for' statement

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-09-15 16:50:01 +01:00
parent 33746aac32
commit 4e4d71a838

View File

@ -430,11 +430,12 @@ static int aead_multipart_internal_func( int key_type_arg, data_t *key_data,
{ {
/* Pass additional data in parts */ /* Pass additional data in parts */
ad_part_len = (size_t) ad_part_len_arg; ad_part_len = (size_t) ad_part_len_arg;
part_offset = 0;
while( part_offset < additional_data->len ) for( part_offset = 0, part_count = 0;
part_offset < additional_data->len;
part_offset += part_length, part_count++ )
{ {
if( do_zero_parts && part_count++ & 0x01 ) if( do_zero_parts && ( part_count & 0x01 ) )
{ {
part_length = 0; part_length = 0;
} }
@ -454,7 +455,6 @@ static int aead_multipart_internal_func( int key_type_arg, data_t *key_data,
additional_data->x + part_offset, additional_data->x + part_offset,
part_length ) ); part_length ) );
part_offset += part_length;
} }
} }
else else
@ -473,11 +473,11 @@ static int aead_multipart_internal_func( int key_type_arg, data_t *key_data,
ASSERT_ALLOC( part_data, part_data_size ); ASSERT_ALLOC( part_data, part_data_size );
part_offset = 0; for( part_offset = 0, part_count = 0;
part_offset < data_true_size;
while( part_offset < data_true_size ) part_offset += part_length, part_count++ )
{ {
if( do_zero_parts && part_count++ & 0x01 ) if( do_zero_parts && ( part_count & 0x01 ) )
{ {
part_length = 0; part_length = 0;
} }
@ -505,7 +505,6 @@ static int aead_multipart_internal_func( int key_type_arg, data_t *key_data,
output_part_length ); output_part_length );
} }
part_offset += part_length;
output_length += output_part_length; output_length += output_part_length;
} }
} }