Normalize whitespace to Mbed TLS standards

Only whitespace changes in this commit.
This commit is contained in:
Gilles Peskine 2018-06-11 17:13:00 +02:00 committed by itayzafrir
parent ef057ac8ed
commit 99bc649760

View file

@ -1013,7 +1013,7 @@ psa_status_t psa_mac_abort( psa_mac_operation_t *operation )
unsigned int block_size = unsigned int block_size =
PSA_HASH_BLOCK_SIZE( ( PSA_ALG_HMAC_HASH( operation->alg ) ) ); PSA_HASH_BLOCK_SIZE( ( PSA_ALG_HMAC_HASH( operation->alg ) ) );
if(block_size == 0) if( block_size == 0 )
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
psa_hash_abort( &operation->ctx.hmac.hash_ctx ); psa_hash_abort( &operation->ctx.hmac.hash_ctx );
@ -1063,8 +1063,8 @@ psa_status_t psa_mac_start( psa_mac_operation_t *operation,
return( status ); return( status );
slot = &global_data.key_slots[key]; slot = &global_data.key_slots[key];
if (slot->type == PSA_KEY_TYPE_NONE) if( slot->type == PSA_KEY_TYPE_NONE )
return(PSA_ERROR_EMPTY_SLOT); return( PSA_ERROR_EMPTY_SLOT );
key_ptr = slot->data.raw.data; key_ptr = slot->data.raw.data;
key_length = slot->data.raw.bytes; key_length = slot->data.raw.bytes;
@ -1126,28 +1126,28 @@ psa_status_t psa_mac_start( psa_mac_operation_t *operation,
if( key_bits / 8 > (size_t) block_size ) if( key_bits / 8 > (size_t) block_size )
{ {
status = psa_hash_update(&operation->ctx.hmac.hash_ctx, status = psa_hash_update( &operation->ctx.hmac.hash_ctx,
key_ptr, slot->data.raw.bytes); key_ptr, slot->data.raw.bytes);
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
goto cleanup; goto cleanup;
status = psa_hash_finish(&operation->ctx.hmac.hash_ctx, sum, status = psa_hash_finish( &operation->ctx.hmac.hash_ctx,
sum_size, &sum_size); sum, sum_size, &sum_size);
if ( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
goto cleanup; goto cleanup;
key_length = sum_size; key_length = sum_size;
key_ptr = sum; key_ptr = sum;
} }
opad = ( unsigned char * ) operation->ctx.hmac.hmac_ctx; opad = (unsigned char *) operation->ctx.hmac.hmac_ctx;
memset( ipad, 0x36, block_size ); memset( ipad, 0x36, block_size );
memset( opad, 0x5C, block_size ); memset( opad, 0x5C, block_size );
for( i = 0; i < key_length; i++ ) for( i = 0; i < key_length; i++ )
{ {
ipad[i] = ( unsigned char )( ipad[i] ^ key_ptr[i] ); ipad[i] = (unsigned char) ( ipad[i] ^ key_ptr[i] );
opad[i] = ( unsigned char )( opad[i] ^ key_ptr[i] ); opad[i] = (unsigned char) ( opad[i] ^ key_ptr[i] );
} }
status = psa_hash_start( &operation->ctx.hmac.hash_ctx, status = psa_hash_start( &operation->ctx.hmac.hash_ctx,
@ -1172,11 +1172,11 @@ cleanup:
operation->alg = alg; operation->alg = alg;
if( ret != 0 ) if( ret != 0 )
{ {
psa_mac_abort( operation ); psa_mac_abort(operation);
return( mbedtls_to_psa_error( ret ) ); if ( ret != 0 )
status = mbedtls_to_psa_error(ret);
} }
operation->key_set = 1;
return( PSA_SUCCESS );
} }
psa_status_t psa_mac_update( psa_mac_operation_t *operation, psa_status_t psa_mac_update( psa_mac_operation_t *operation,
@ -1261,13 +1261,13 @@ static psa_status_t psa_mac_finish_internal( psa_mac_operation_t *operation,
unsigned int block_size = unsigned int block_size =
PSA_HASH_BLOCK_SIZE( ( PSA_ALG_HMAC_HASH( operation->alg ) ) ); PSA_HASH_BLOCK_SIZE( ( PSA_ALG_HMAC_HASH( operation->alg ) ) );
if (block_size == 0) if( block_size == 0 )
return(PSA_ERROR_NOT_SUPPORTED); return( PSA_ERROR_NOT_SUPPORTED );
opad = (unsigned char *) operation->ctx.hmac.hmac_ctx; opad = (unsigned char *) operation->ctx.hmac.hmac_ctx;
status = psa_hash_finish( &operation->ctx.hmac.hash_ctx, tmp, status = psa_hash_finish( &operation->ctx.hmac.hash_ctx, tmp,
sizeof ( tmp ), &hash_size ); sizeof( tmp ), &hash_size );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
goto cleanup; goto cleanup;
@ -1307,7 +1307,7 @@ cleanup:
else else
{ {
psa_mac_abort( operation ); psa_mac_abort( operation );
if (ret != 0) if( ret != 0 )
status = mbedtls_to_psa_error(ret); status = mbedtls_to_psa_error(ret);
return status; return status;
@ -1322,7 +1322,7 @@ psa_status_t psa_mac_finish( psa_mac_operation_t *operation,
if( !( operation->key_usage_sign ) ) if( !( operation->key_usage_sign ) )
return( PSA_ERROR_NOT_PERMITTED ); return( PSA_ERROR_NOT_PERMITTED );
return( psa_mac_finish_internal(operation, mac, return( psa_mac_finish_internal( operation, mac,
mac_size, mac_length ) ); mac_size, mac_length ) );
} }