Remove the UN_USED_DISABLE attribute
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja
index a446d4a..3d116b3 100644
--- a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja
+++ b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja
@@ -82,15 +82,6 @@
#include "psa_crypto_se.h"
#endif
-#if defined(_MSC_VER)
-#pragma warning( push )
-#pragma warning( disable : 4100)
-#define UN_USED_DISABLE
-#else
-#define UN_USED_DISABLE __attribute__((unused))
-#endif
-
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_init( void )
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
@@ -115,7 +106,6 @@
return( PSA_SUCCESS );
}
-UN_USED_DISABLE
static inline void psa_driver_wrapper_free( void )
{
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
@@ -131,7 +121,6 @@
}
/* Start delegation functions */
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_sign_message(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -207,7 +196,6 @@
signature_length ) );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_verify_message(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -279,7 +267,6 @@
signature_length ) );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_sign_hash(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@@ -384,7 +371,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_verify_hash(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@@ -486,7 +472,6 @@
}
}
-UN_USED_DISABLE
static inline uint32_t psa_driver_wrapper_sign_hash_get_num_ops(
psa_sign_hash_interruptible_operation_t *operation )
{
@@ -510,7 +495,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline uint32_t psa_driver_wrapper_verify_hash_get_num_ops(
psa_verify_hash_interruptible_operation_t *operation )
{
@@ -535,7 +519,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_sign_hash_start(
psa_sign_hash_interruptible_operation_t *operation,
const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
@@ -589,7 +572,6 @@
return( status );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_sign_hash_complete(
psa_sign_hash_interruptible_operation_t *operation,
uint8_t *signature, size_t signature_size,
@@ -617,7 +599,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_sign_hash_abort(
psa_sign_hash_interruptible_operation_t *operation )
{
@@ -637,7 +618,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_verify_hash_start(
psa_verify_hash_interruptible_operation_t *operation,
const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
@@ -696,7 +676,6 @@
return( status );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_verify_hash_complete(
psa_verify_hash_interruptible_operation_t *operation )
{
@@ -718,7 +697,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_verify_hash_abort(
psa_verify_hash_interruptible_operation_t *operation )
{
@@ -751,7 +729,6 @@
* \retval #PSA_ERROR_INVALID_ARGUMENT \emptydescription
* \retval #PSA_ERROR_NOT_SUPPORTED \emptydescription
*/
- UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_get_key_buffer_size_from_key_data(
const psa_key_attributes_t *attributes,
const uint8_t *data,
@@ -781,7 +758,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_generate_key(
const psa_key_attributes_t *attributes,
uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length )
@@ -868,7 +844,6 @@
return( status );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_import_key(
const psa_key_attributes_t *attributes,
const uint8_t *data,
@@ -950,7 +925,6 @@
{% endwith %}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_export_key(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@@ -1013,7 +987,6 @@
{% endwith %}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_copy_key(
psa_key_attributes_t *attributes,
const uint8_t *source_key, size_t source_key_length,
@@ -1066,7 +1039,6 @@
/*
* Cipher functions
*/
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_encrypt(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -1159,7 +1131,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_decrypt(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -1242,7 +1213,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_encrypt_setup(
psa_cipher_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -1316,7 +1286,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_decrypt_setup(
psa_cipher_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -1390,7 +1359,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_set_iv(
psa_cipher_operation_t *operation,
const uint8_t *iv,
@@ -1426,7 +1394,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_update(
psa_cipher_operation_t *operation,
const uint8_t *input,
@@ -1473,7 +1440,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_finish(
psa_cipher_operation_t *operation,
uint8_t *output,
@@ -1512,7 +1478,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_cipher_abort(
psa_cipher_operation_t *operation )
{
@@ -1553,7 +1518,6 @@
/*
* Hashing functions
*/
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_compute(
psa_algorithm_t alg,
const uint8_t *input,
@@ -1590,7 +1554,6 @@
return( PSA_ERROR_NOT_SUPPORTED );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_setup(
psa_hash_operation_t *operation,
psa_algorithm_t alg )
@@ -1624,7 +1587,6 @@
return( PSA_ERROR_NOT_SUPPORTED );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_clone(
const psa_hash_operation_t *source_operation,
psa_hash_operation_t *target_operation )
@@ -1650,7 +1612,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_update(
psa_hash_operation_t *operation,
const uint8_t *input,
@@ -1676,7 +1637,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_finish(
psa_hash_operation_t *operation,
uint8_t *hash,
@@ -1704,7 +1664,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_hash_abort(
psa_hash_operation_t *operation )
{
@@ -1724,7 +1683,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_encrypt(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@@ -1777,7 +1735,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_decrypt(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@@ -1830,7 +1787,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_encrypt_setup(
psa_aead_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -1879,7 +1835,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_decrypt_setup(
psa_aead_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -1930,7 +1885,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_set_nonce(
psa_aead_operation_t *operation,
const uint8_t *nonce,
@@ -1965,7 +1919,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_set_lengths(
psa_aead_operation_t *operation,
size_t ad_length,
@@ -2000,7 +1953,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_update_ad(
psa_aead_operation_t *operation,
const uint8_t *input,
@@ -2035,7 +1987,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_update(
psa_aead_operation_t *operation,
const uint8_t *input,
@@ -2078,7 +2029,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_finish(
psa_aead_operation_t *operation,
uint8_t *ciphertext,
@@ -2124,7 +2074,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_verify(
psa_aead_operation_t *operation,
uint8_t *plaintext,
@@ -2188,7 +2137,6 @@
return( PSA_ERROR_INVALID_ARGUMENT );
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_aead_abort(
psa_aead_operation_t *operation )
{
@@ -2218,7 +2166,6 @@
/*
* MAC functions
*/
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_compute(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -2287,7 +2234,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_sign_setup(
psa_mac_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -2360,7 +2306,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_verify_setup(
psa_mac_operation_t *operation,
const psa_key_attributes_t *attributes,
@@ -2433,7 +2378,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_update(
psa_mac_operation_t *operation,
const uint8_t *input,
@@ -2467,7 +2411,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_sign_finish(
psa_mac_operation_t *operation,
uint8_t *mac,
@@ -2503,7 +2446,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_verify_finish(
psa_mac_operation_t *operation,
const uint8_t *mac,
@@ -2537,7 +2479,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_mac_abort(
psa_mac_operation_t *operation )
{
@@ -2566,7 +2507,6 @@
/*
* Asymmetric cryptography
*/
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
@@ -2625,7 +2565,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
@@ -2684,7 +2623,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_key_agreement(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer,
@@ -2696,7 +2634,7 @@
size_t shared_secret_size,
size_t *shared_secret_length
)
- {
+{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_location_t location =
PSA_KEY_LIFETIME_GET_LOCATION( attributes->core.lifetime );
@@ -2770,9 +2708,8 @@
return( PSA_ERROR_NOT_SUPPORTED );
}
- }
+}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_pake_setup(
psa_pake_operation_t *operation,
const psa_crypto_driver_pake_inputs_t *inputs )
@@ -2817,7 +2754,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_pake_output(
psa_pake_operation_t *operation,
psa_crypto_driver_pake_step_t step,
@@ -2850,7 +2786,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_pake_input(
psa_pake_operation_t *operation,
psa_crypto_driver_pake_step_t step,
@@ -2883,7 +2818,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_pake_get_implicit_key(
psa_pake_operation_t *operation,
uint8_t *output, size_t output_size,
@@ -2913,7 +2847,6 @@
}
}
-UN_USED_DISABLE
static inline psa_status_t psa_driver_wrapper_pake_abort(
psa_pake_operation_t * operation )
{
@@ -2936,8 +2869,4 @@
}
}
-#if defined(_MSC_VER)
-#pragma warning( pop )
-#endif
-
#endif /* MBEDTLS_PSA_CRYPTO_C */