cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-30 19:20:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

PSA PAKE: Align macro names with psa_pake_step_t

Browse Source 
Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath 2021-05-13 12:01:11 +01:00
parent 3c09c47333
commit 56cc9ccc39
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/psa/crypto.h
View File

@ -4273,9 +4273,9 @@ static psa_pake_operation_t psa_pake_operation_init(void);
* *
* A typical sequence of calls to perform a password-authenticated key * A typical sequence of calls to perform a password-authenticated key
* exchange: * exchange:
* -# Call psa_pake_output(operation, #PSA_PAKE_DATA_KEY_SHARE, ...) to get the * -# Call psa_pake_output(operation, #PSA_PAKE_STEP_KEY_SHARE, ...) to get the
* key share that needs to be sent to the peer. * key share that needs to be sent to the peer.
* -# Call psa_pake_input(operation, #PSA_PAKE_DATA_KEY_SHARE, ...) to provide * -# Call psa_pake_input(operation, #PSA_PAKE_STEP_KEY_SHARE, ...) to provide
* the key share that was received from the peer. * the key share that was received from the peer.
* -# Call psa_pake_get_implicit_key() for accessing the shared secret. * -# Call psa_pake_get_implicit_key() for accessing the shared secret.
* -# Make a sequence of function calls to execute the password-authenticated * -# Make a sequence of function calls to execute the password-authenticated

44
include/psa/crypto_values.h
View File

@ -1993,52 +1993,52 @@
* The key exchange flow for JPAKE is as follows: * The key exchange flow for JPAKE is as follows:
* -# To get the first round data that needs to be sent to the peer, call * -# To get the first round data that needs to be sent to the peer, call
* // Get g1 * // Get g1
* psa_pake_output(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Get the ZKP public key for x1 * // Get the ZKP public key for x1
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Get the ZKP proof for x1 * // Get the ZKP proof for x1
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* // Get g2 * // Get g2
* psa_pake_output(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Get the ZKP public key for x2 * // Get the ZKP public key for x2
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Get the ZKP proof for x2 * // Get the ZKP proof for x2
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* -# To provide the first round data received from the peer to the operation, * -# To provide the first round data received from the peer to the operation,
* call * call
* // Set g3 * // Set g3
* psa_pake_input(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Set the ZKP public key for x3 * // Set the ZKP public key for x3
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Set the ZKP proof for x3 * // Set the ZKP proof for x3
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* // Set g4 * // Set g4
* psa_pake_input(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Set the ZKP public key for x4 * // Set the ZKP public key for x4
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Set the ZKP proof for x4 * // Set the ZKP proof for x4
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* -# To get the second round data that needs to be sent to the peer, call * -# To get the second round data that needs to be sent to the peer, call
* // Get A * // Get A
* psa_pake_output(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Get ZKP public key for x2*s * // Get ZKP public key for x2*s
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Get ZKP proof for x2*s * // Get ZKP proof for x2*s
* psa_pake_output(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_output(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* -# To provide the second round data received from the peer to the operation, * -# To provide the second round data received from the peer to the operation,
* call * call
* // Set B * // Set B
* psa_pake_input(operation, #PSA_PAKE_DATA_KEY_SHARE, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_KEY_SHARE, ...);
* // Set ZKP public key for x4*s * // Set ZKP public key for x4*s
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PUBLIC, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PUBLIC, ...);
* // Set ZKP proof for x4*s * // Set ZKP proof for x4*s
* psa_pake_input(operation, #PSA_PAKE_DATA_ZK_PROOF, ...); * psa_pake_input(operation, #PSA_PAKE_STEP_ZK_PROOF, ...);
* -# To access the shared secret call * -# To access the shared secret call
* // Get Ka=Kb=K * // Get Ka=Kb=K
* psa_pake_get_implicit_key() * psa_pake_get_implicit_key()
* *
* For more information consult the documentation of the individual * For more information consult the documentation of the individual
* PSA_PAKE_DATA_XXX constants. * PSA_PAKE_STEP_XXX constants.
* *
* J-PAKE is standardised for example in RFC 8236. * J-PAKE is standardised for example in RFC 8236.
*/ */
@ -2578,7 +2578,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* For information regarding representation consult the documentation of * For information regarding representation consult the documentation of
* individual ::psa_pake_primitive_type_t constants. * individual ::psa_pake_primitive_type_t constants.
*/ */
#define PSA_PAKE_DATA_KEY_SHARE ((psa_pake_step_t)0x01) #define PSA_PAKE_STEP_KEY_SHARE ((psa_pake_step_t)0x01)
/** A Schnorr NIZKP public key. /** A Schnorr NIZKP public key.
* *
@ -2587,7 +2587,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* For information regarding representation consult the documentation of * For information regarding representation consult the documentation of
* individual ::psa_pake_primitive_type_t constants. * individual ::psa_pake_primitive_type_t constants.
*/ */
#define PSA_PAKE_DATA_ZK_PUBLIC ((psa_pake_step_t)0x02) #define PSA_PAKE_STEP_ZK_PUBLIC ((psa_pake_step_t)0x02)
/** A Schnorr NIZKP proof. /** A Schnorr NIZKP proof.
* *
@ -2596,7 +2596,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
* For information regarding representation consult the documentation of * For information regarding representation consult the documentation of
* individual ::psa_pake_primitive_type_t constants. * individual ::psa_pake_primitive_type_t constants.
*/ */
#define PSA_PAKE_DATA_ZK_PROOF ((psa_pake_step_t)0x03) #define PSA_PAKE_STEP_ZK_PROOF ((psa_pake_step_t)0x03)
/**@}*/ /**@}*/
#endif /* PSA_CRYPTO_VALUES_H */ #endif /* PSA_CRYPTO_VALUES_H */