Style and language fixes from review
Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
index 140c3d4..11aeef8 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -411,10 +411,10 @@
output_length );
/* Declared with fallback == true */
if( status != PSA_ERROR_NOT_SUPPORTED )
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
/* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LIFETIME:
@@ -430,7 +430,7 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is declared with a lifetime not known to us */
- return status;
+ return( status );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) slot;
@@ -441,7 +441,7 @@
(void) output_size;
(void) output_length;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -478,10 +478,10 @@
output_length );
/* Declared with fallback == true */
if( status != PSA_ERROR_NOT_SUPPORTED )
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
/* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LIFETIME:
@@ -497,7 +497,7 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is declared with a lifetime not known to us */
- return status;
+ return( status );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) slot;
@@ -508,7 +508,7 @@
(void) output_size;
(void) output_length;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -526,7 +526,7 @@
/* Check for operation already allocated */
if( operation->ctx.driver.ctx != NULL )
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
switch( location )
{
@@ -554,7 +554,7 @@
operation->ctx.driver.ctx = NULL;
}
- return status;
+ return( status );
}
else
{
@@ -563,13 +563,13 @@
}
#endif /* PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
/* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LIFETIME:
operation->ctx.driver.ctx = mbedtls_calloc( 1, sizeof(test_opaque_cipher_operation_t) );
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INSUFFICIENT_MEMORY;
+ return( PSA_ERROR_INSUFFICIENT_MEMORY );
status = test_opaque_cipher_encrypt_setup( operation->ctx.driver.ctx,
&attributes,
@@ -584,18 +584,18 @@
operation->ctx.driver.ctx = NULL;
}
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is declared with a lifetime not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void)slot;
(void)alg;
(void)operation;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -613,7 +613,7 @@
/* Check for operation already allocated */
if( operation->ctx.driver.ctx != NULL )
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
switch( location )
{
@@ -623,7 +623,7 @@
#if defined(PSA_CRYPTO_DRIVER_TEST)
operation->ctx.driver.ctx = mbedtls_calloc( 1, sizeof(test_transparent_cipher_operation_t) );
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INSUFFICIENT_MEMORY;
+ return( PSA_ERROR_INSUFFICIENT_MEMORY );
status = test_transparent_cipher_decrypt_setup( operation->ctx.driver.ctx,
&attributes,
@@ -641,7 +641,7 @@
operation->ctx.driver.ctx = NULL;
}
- return status;
+ return( status );
}
else
{
@@ -650,7 +650,7 @@
}
#endif /* PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
/* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LIFETIME:
@@ -671,18 +671,18 @@
operation->ctx.driver.ctx = NULL;
}
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is declared with a lifetime not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void)slot;
(void)alg;
(void)operation;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -695,7 +695,7 @@
#if defined(PSA_CRYPTO_DRIVER_PRESENT) && defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
/* Check for operation already allocated */
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INVALID_ARGUMENT;
+ return( PSA_ERROR_INVALID_ARGUMENT );
switch( operation->ctx.driver.id )
{
@@ -715,7 +715,7 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is attached to a driver not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) operation;
@@ -723,7 +723,7 @@
(void) iv_size;
(void) iv_length;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -735,7 +735,7 @@
#if defined(PSA_CRYPTO_DRIVER_PRESENT) && defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
/* Check for operation already allocated */
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INVALID_ARGUMENT;
+ return( PSA_ERROR_INVALID_ARGUMENT );
switch( operation->ctx.driver.id )
{
@@ -753,14 +753,14 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is attached to a driver not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) operation;
(void) iv;
(void) iv_length;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -775,7 +775,7 @@
#if defined(PSA_CRYPTO_DRIVER_PRESENT) && defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
/* Check for operation already allocated */
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INVALID_ARGUMENT;
+ return( PSA_ERROR_INVALID_ARGUMENT );
switch( operation->ctx.driver.id )
{
@@ -799,7 +799,7 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is attached to a driver not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) operation;
@@ -809,7 +809,7 @@
(void) output_length;
(void) output_size;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -822,7 +822,7 @@
#if defined(PSA_CRYPTO_DRIVER_PRESENT) && defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
/* Check for operation already allocated */
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INVALID_ARGUMENT;
+ return( PSA_ERROR_INVALID_ARGUMENT );
switch( operation->ctx.driver.id )
{
@@ -842,7 +842,7 @@
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Key is attached to a driver not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void) operation;
@@ -850,7 +850,7 @@
(void) output_size;
(void) output_length;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}
@@ -861,7 +861,7 @@
psa_status_t status = PSA_ERROR_INVALID_ARGUMENT;
/* Check for operation already allocated */
if( operation->ctx.driver.ctx == NULL )
- return PSA_ERROR_INVALID_ARGUMENT;
+ return( PSA_ERROR_INVALID_ARGUMENT );
switch( operation->ctx.driver.id )
{
@@ -873,7 +873,7 @@
operation->ctx.driver.ctx = NULL;
operation->ctx.driver.id = 0;
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
#if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_OPAQUE_TEST_DRIVER_ID:
@@ -881,16 +881,16 @@
mbedtls_free( operation->ctx.driver.ctx );
operation->ctx.driver.ctx = NULL;
- return status;
+ return( status );
#endif /* PSA_CRYPTO_DRIVER_TEST */
default:
/* Operation is attached to a driver not known to us */
- return PSA_ERROR_BAD_STATE;
+ return( PSA_ERROR_BAD_STATE );
}
#else /* PSA_CRYPTO_DRIVER_PRESENT */
(void)operation;
- return PSA_ERROR_NOT_SUPPORTED;
+ return( PSA_ERROR_NOT_SUPPORTED );
#endif /* PSA_CRYPTO_DRIVER_PRESENT */
}