From 82b54b96d3e5be4d491a17e9e369a973bd51cbff Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Wed, 28 Apr 2021 13:47:12 +0100 Subject: [PATCH] PSA PAKE: Align macro names In the key types API, PSA Crypto uses ECC to denote Elliptic curve cryptography and DH to denote Finite Field Diffie-Hellman. Change PSA_PAKE_PRIMITIVE_TYPE_XXX macros to be aligned. Signed-off-by: Janos Follath --- include/psa/crypto_values.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h index 0e3d9231a8..9a9f69e611 100644 --- a/include/psa/crypto_values.h +++ b/include/psa/crypto_values.h @@ -1969,8 +1969,8 @@ /** The Password-authenticated key exchange by juggling (J-PAKE) algorithm. * * J-PAKE can be instantiated over finite fields or elliptic curves. This can - * be achieved by passing either #PSA_PAKE_PRIMITIVE_TYPE_FIELD_DH or - * #PSA_PAKE_PRIMITIVE_TYPE_CURVE to #PSA_PAKE_PRIMITIVE respectively, when + * be achieved by passing either #PSA_PAKE_PRIMITIVE_TYPE_DH or + * #PSA_PAKE_PRIMITIVE_TYPE_ECC to #PSA_PAKE_PRIMITIVE respectively, when * creating the cipher suite. * * In theory the algorithm works with any non-interactive zero-knowledge proof. @@ -2515,7 +2515,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key ) * curve would be. For more information, consult the documentation of * psa_export_key(). */ -#define PSA_PAKE_PRIMITIVE_TYPE_CURVE ((psa_pake_primitive_type_t)0x01) +#define PSA_PAKE_PRIMITIVE_TYPE_ECC ((psa_pake_primitive_type_t)0x01) /** The PAKE uses finite fields based Diffie-Hellman groups. * @@ -2532,7 +2532,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key ) * group would be. For more information, consult the documentation of * psa_export_key(). */ -#define PSA_PAKE_PRIMITIVE_TYPE_FIELD_DH ((psa_pake_primitive_type_t)0x02) +#define PSA_PAKE_PRIMITIVE_TYPE_DH ((psa_pake_primitive_type_t)0x02) /** Construct a PAKE primitive from type, family and bitsize. *