Rename psa_pake_data_t

"Data" is too vague, renaming it to psa_pake_step_t. It is still
somewhat vague, but at least consistent with the naming used in key
derivation.

Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath 2021-05-11 09:11:39 +01:00
parent 57cfc407e0
commit beb78d4d41
4 changed files with 13 additions and 13 deletions

View file

@ -4478,7 +4478,7 @@ psa_status_t psa_pake_setup(psa_pake_operation_t *operation,
* results in this error code. * results in this error code.
*/ */
psa_status_t psa_pake_output(psa_pake_operation_t *operation, psa_status_t psa_pake_output(psa_pake_operation_t *operation,
psa_pake_data_t type, psa_pake_step_t type,
uint8_t *output, uint8_t *output,
size_t output_size, size_t output_size,
size_t *output_length); size_t *output_length);
@ -4518,7 +4518,7 @@ psa_status_t psa_pake_output(psa_pake_operation_t *operation,
* results in this error code. * results in this error code.
*/ */
psa_status_t psa_pake_input(psa_pake_operation_t *operation, psa_status_t psa_pake_input(psa_pake_operation_t *operation,
psa_pake_data_t type, psa_pake_step_t type,
uint8_t *input, uint8_t *input,
size_t input_length); size_t input_length);

View file

@ -1144,7 +1144,7 @@
* \param alg A PAKE algorithm (PSA_ALG_XXX value such that * \param alg A PAKE algorithm (PSA_ALG_XXX value such that
* #PSA_ALG_IS_PAKE(\p alg) is true). * #PSA_ALG_IS_PAKE(\p alg) is true).
* \param cipher_suite A cipher suite that is compatible with algorithm \p alg. * \param cipher_suite A cipher suite that is compatible with algorithm \p alg.
* \param output_step A value of type ::psa_pake_data_t that is valid for the * \param output_step A value of type ::psa_pake_step_t that is valid for the
* algorithm \p alg. * algorithm \p alg.
* \return A sufficient output buffer size for the specified * \return A sufficient output buffer size for the specified
* output, cipher suite and algorithm. If the cipher suite, * output, cipher suite and algorithm. If the cipher suite,

View file

@ -397,7 +397,7 @@ typedef uint8_t psa_pake_side_t;
* This type is for encoding additional input and output data for such * This type is for encoding additional input and output data for such
* algorithms. * algorithms.
*/ */
typedef uint8_t psa_pake_data_t; typedef uint8_t psa_pake_step_t;
/** Encoding of the type of the PAKE's primitive. /** Encoding of the type of the PAKE's primitive.
* *

View file

@ -2554,7 +2554,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* received. For values sent or received afterwards, use * received. For values sent or received afterwards, use
* #PSA_PAKE_DATA_KEY_SHARE_2 and #PSA_PAKE_DATA_KEY_SHARE_3. * #PSA_PAKE_DATA_KEY_SHARE_2 and #PSA_PAKE_DATA_KEY_SHARE_3.
*/ */
#define PSA_PAKE_DATA_KEY_SHARE ((psa_pake_data_t)0x01) #define PSA_PAKE_DATA_KEY_SHARE ((psa_pake_step_t)0x01)
/** A Schnorr NIZKP public key. /** A Schnorr NIZKP public key.
* *
@ -2568,7 +2568,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* key received. For values sent or received afterwards, use * key received. For values sent or received afterwards, use
* #PSA_PAKE_DATA_ZK_PUBLIC_2 and #PSA_PAKE_DATA_ZK_PUBLIC_3. * #PSA_PAKE_DATA_ZK_PUBLIC_2 and #PSA_PAKE_DATA_ZK_PUBLIC_3.
*/ */
#define PSA_PAKE_DATA_ZK_PUBLIC ((psa_pake_data_t)0x02) #define PSA_PAKE_DATA_ZK_PUBLIC ((psa_pake_step_t)0x02)
/** A Schnorr NIZKP proof. /** A Schnorr NIZKP proof.
* *
@ -2582,43 +2582,43 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* received. For values sent or received afterwards, use * received. For values sent or received afterwards, use
* #PSA_PAKE_DATA_ZK_PROOF_2 and #PSA_PAKE_DATA_ZK_PROOF_3. * #PSA_PAKE_DATA_ZK_PROOF_2 and #PSA_PAKE_DATA_ZK_PROOF_3.
*/ */
#define PSA_PAKE_DATA_ZK_PROOF ((psa_pake_data_t)0x03) #define PSA_PAKE_DATA_ZK_PROOF ((psa_pake_step_t)0x03)
/** Marks the second key share sent and received. /** Marks the second key share sent and received.
* *
* See #PSA_PAKE_DATA_KEY_SHARE. * See #PSA_PAKE_DATA_KEY_SHARE.
*/ */
#define PSA_PAKE_DATA_KEY_SHARE_2 ((psa_pake_data_t)0x04) #define PSA_PAKE_DATA_KEY_SHARE_2 ((psa_pake_step_t)0x04)
/** Marks the second Schnorr NIZKP public key sent and received. /** Marks the second Schnorr NIZKP public key sent and received.
* *
* See #PSA_PAKE_DATA_ZK_PUBLIC. * See #PSA_PAKE_DATA_ZK_PUBLIC.
*/ */
#define PSA_PAKE_DATA_ZK_PUBLIC_2 ((psa_pake_data_t)0x05) #define PSA_PAKE_DATA_ZK_PUBLIC_2 ((psa_pake_step_t)0x05)
/** Marks the second Schnorr NIZKP proof sent and received. /** Marks the second Schnorr NIZKP proof sent and received.
* *
* See #PSA_PAKE_DATA_ZK_PROOF. * See #PSA_PAKE_DATA_ZK_PROOF.
*/ */
#define PSA_PAKE_DATA_ZK_PROOF_2 ((psa_pake_data_t)0x06) #define PSA_PAKE_DATA_ZK_PROOF_2 ((psa_pake_step_t)0x06)
/** Marks the third key share sent and received. /** Marks the third key share sent and received.
* *
* See #PSA_PAKE_DATA_KEY_SHARE. * See #PSA_PAKE_DATA_KEY_SHARE.
*/ */
#define PSA_PAKE_DATA_KEY_SHARE_3 ((psa_pake_data_t)0x07) #define PSA_PAKE_DATA_KEY_SHARE_3 ((psa_pake_step_t)0x07)
/** Marks the third Schnorr NIZKP public key sent and received. /** Marks the third Schnorr NIZKP public key sent and received.
* *
* See #PSA_PAKE_DATA_ZK_PUBLIC. * See #PSA_PAKE_DATA_ZK_PUBLIC.
*/ */
#define PSA_PAKE_DATA_ZK_PUBLIC_3 ((psa_pake_data_t)0x08) #define PSA_PAKE_DATA_ZK_PUBLIC_3 ((psa_pake_step_t)0x08)
/** Marks the third Schnorr NIZKP proof sent and received. /** Marks the third Schnorr NIZKP proof sent and received.
* *
* See #PSA_PAKE_DATA_ZK_PROOF. * See #PSA_PAKE_DATA_ZK_PROOF.
*/ */
#define PSA_PAKE_DATA_ZK_PROOF_3 ((psa_pake_data_t)0x09) #define PSA_PAKE_DATA_ZK_PROOF_3 ((psa_pake_step_t)0x09)
/**@}*/ /**@}*/
#endif /* PSA_CRYPTO_VALUES_H */ #endif /* PSA_CRYPTO_VALUES_H */