Rename mbedtls_psa_export_public_key_iop_operation_t
Rename it to mbedtls_psa_export_public_key_iop_t as
iop stands for "interuptible operation" already.
Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>
diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
index c5cd45d..1221f61 100644
--- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
+++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
@@ -665,7 +665,7 @@
}
psa_status_t mbedtls_psa_ecp_export_public_key_iop_setup(
- mbedtls_psa_export_public_key_iop_operation_t *operation,
+ mbedtls_psa_export_public_key_iop_t *operation,
uint8_t *private_key,
size_t private_key_len,
const psa_key_attributes_t *private_key_attributes)
@@ -690,7 +690,7 @@
}
psa_status_t mbedtls_psa_ecp_export_public_key_iop_complete(
- mbedtls_psa_export_public_key_iop_operation_t *operation,
+ mbedtls_psa_export_public_key_iop_t *operation,
uint8_t *pub_key,
size_t pub_key_size,
size_t *pub_key_len)
@@ -717,7 +717,7 @@
}
psa_status_t mbedtls_psa_ecp_export_public_key_iop_abort(
- mbedtls_psa_export_public_key_iop_operation_t *operation)
+ mbedtls_psa_export_public_key_iop_t *operation)
{
mbedtls_ecp_keypair_free(operation->key);
mbedtls_free(operation->key);
diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h
index 4211659..c220e82 100644
--- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h
+++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h
@@ -123,7 +123,7 @@
/**
* \brief Setup a new interruptible export public-key operation.
*
- * \param[in] operation The \c mbedtls_psa_export_public_key_iop_operation_t to use.
+ * \param[in] operation The \c mbedtls_psa_export_public_key_iop_t to use.
* This must be initialized first.
* \param[in] private_key pointer to private key.
* \param[in] private_key_len size of \p private_key in bytes.
@@ -142,7 +142,7 @@
*
*/
psa_status_t mbedtls_psa_ecp_export_public_key_iop_setup(
- mbedtls_psa_export_public_key_iop_operation_t *operation,
+ mbedtls_psa_export_public_key_iop_t *operation,
uint8_t *private_key,
size_t private_key_len,
const psa_key_attributes_t *private_key_attributes);
@@ -151,7 +151,7 @@
/**
* \brief Continue and eventually complete an export public-key operation.
*
- * \param[in] operation The \c mbedtls_psa_export_public_key_iop_operation_t to use.
+ * \param[in] operation The \c mbedtls_psa_export_public_key_iop_t to use.
* This must be initialized first and
* had \c mbedtls_psa_ecp_export_public_key_iop_setup()
* called successfully.
@@ -167,7 +167,7 @@
*
*/
psa_status_t mbedtls_psa_ecp_export_public_key_iop_complete(
- mbedtls_psa_export_public_key_iop_operation_t *operation,
+ mbedtls_psa_export_public_key_iop_t *operation,
uint8_t *pub_key,
size_t pub_key_size,
size_t *pub_key_len);
@@ -175,13 +175,13 @@
/**
* \brief Abort an interruptible export public-key operation.
*
- * \param[in] operation The \c mbedtls_psa_export_public_key_iop_operation_t to abort.
+ * \param[in] operation The \c mbedtls_psa_export_public_key_iop_t to abort.
*
* \retval #PSA_SUCCESS
* The operation was aborted successfully.
*/
psa_status_t mbedtls_psa_ecp_export_public_key_iop_abort(
- mbedtls_psa_export_public_key_iop_operation_t *operation);
+ mbedtls_psa_export_public_key_iop_t *operation);
/**
* \brief Generate an ECP key.
diff --git a/tf-psa-crypto/include/psa/crypto_builtin_composites.h b/tf-psa-crypto/include/psa/crypto_builtin_composites.h
index 9bd58f9..ba5375f 100644
--- a/tf-psa-crypto/include/psa/crypto_builtin_composites.h
+++ b/tf-psa-crypto/include/psa/crypto_builtin_composites.h
@@ -258,7 +258,7 @@
/* Make the struct non-empty if algs not supported. */
unsigned MBEDTLS_PRIVATE(dummy);
#endif
-} mbedtls_psa_export_public_key_iop_operation_t;
+} mbedtls_psa_export_public_key_iop_t;
#if defined(MBEDTLS_ECP_C) && defined(MBEDTLS_ECP_RESTARTABLE)
#define MBEDTLS_PSA_EXPORT_PUBLIC_KEY_IOP_INIT { NULL, MBEDTLS_ECP_RESTART_INIT, 0 }
diff --git a/tf-psa-crypto/include/psa/crypto_struct.h b/tf-psa-crypto/include/psa/crypto_struct.h
index d0300da..ffaf6c2 100644
--- a/tf-psa-crypto/include/psa/crypto_struct.h
+++ b/tf-psa-crypto/include/psa/crypto_struct.h
@@ -584,7 +584,7 @@
* any driver (i.e. none of the driver contexts are active).
*/
unsigned int MBEDTLS_PRIVATE(id);
- mbedtls_psa_export_public_key_iop_operation_t MBEDTLS_PRIVATE(ctx);
+ mbedtls_psa_export_public_key_iop_t MBEDTLS_PRIVATE(ctx);
unsigned int MBEDTLS_PRIVATE(error_occurred) : 1;
uint32_t MBEDTLS_PRIVATE(num_ops);
#endif