cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-03 20:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

PSA PAKE: remove obsolete types and macros

Browse Source 
Making the cipher suite struct internal made a number of types and
macros in the interface unused.

Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath 2021-04-30 12:50:32 +01:00
parent cd56ff9c59
commit 684da03532
2 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/psa/crypto_types.h
View File

@ -406,28 +406,5 @@ typedef uint8_t psa_pake_data_t;
*/ */
typedef uint8_t psa_pake_primitive_type_t; typedef uint8_t psa_pake_primitive_type_t;
/** Encoding of the bitsize for the PAKE's primitive.
*
* The type and family is not enough to identify the primitive to use in the
* PAKE, the implementation needs to know the bitsize too.
*/
typedef uint16_t psa_pake_bits_t;
/** Encoding of the PAKE's primitive.
*
* In most of the PAKEs the primitives are prime order groups, but some of
* them might need the ring structure or just are using completely different
* algebraic structures (eg. SRP or PQC schemes).
*/
typedef uint32_t psa_pake_primitive_t;
/** Encoding of additional options for PAKE.
*
* This type is for encoding additional options into PAKE cipher suites.
* (Options like for example EnvelopeMode in OPAQUE or "Per-User M and N" in
* SPAKE2.)
*/
typedef uint32_t psa_pake_cipher_suite_options_t;
/**@}*/ /**@}*/
#endif /* PSA_CRYPTO_TYPES_H */ #endif /* PSA_CRYPTO_TYPES_H */

34
include/psa/crypto_values.h
View File

@ -2504,8 +2504,9 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
/** The PAKE uses elliptic curves. /** The PAKE uses elliptic curves.
* *
* The corresponding family type is ::psa_ecc_family_t. In determining a * The corresponding family type is ::psa_ecc_family_t. In determining a
* specific curve in the family ::psa_pake_bits_t values are interpreted in the * specific curve in the family the cipher suite (see
* exact same way as ::psa_key_bits_t would. * ::psa_pake_cipher_suite_t) bits are interpreted in the exact same way
* as key bits are.
* *
* Input and output during the operation can involve group elements and scalar * Input and output during the operation can involve group elements and scalar
* values: * values:
@ -2521,8 +2522,9 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
/** The PAKE uses finite fields based Diffie-Hellman groups. /** The PAKE uses finite fields based Diffie-Hellman groups.
* *
* The corresponding family type is ::psa_dh_family_t. In determining a * The corresponding family type is ::psa_dh_family_t. In determining a
* specific group in the family ::psa_pake_bits_t values are interpreted in the * specific group in the family the cipher suite (see
* exact same way as ::psa_key_bits_t would. * ::psa_pake_cipher_suite_t) bits are interpreted in the exact same way
* as key bits are.
* *
* Input and output during the operation can involve group elements and scalar * Input and output during the operation can involve group elements and scalar
* values: * values:
@ -2535,28 +2537,6 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
*/ */
#define PSA_PAKE_PRIMITIVE_TYPE_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.
*
* \param pake_type The type of the primitive
* (value of type ::psa_pake_primitive_type_t).
* \param pake_family The family of the primitive
* (the type and interpretation of this parameter depends
* on \p type, for more information consult the
* documentation of individual ::psa_pake_primitive_type_t
* constants).
* \param pake_bits The bitsize of the primitive
* (Value of type ::psa_pake_bits_t. The interpretation
* of this parameter depends on \p family, for more
* information consult the documentation of individual
* ::psa_pake_primitive_type_t constants).
*
* \return The constructed primitive value.
*/
#define PSA_PAKE_PRIMITIVE(pake_type, pake_family, pake_bits) \
((psa_pake_primitive_t) (((pake_type) << 24 | \
(pake_family) << 16) | (pake_bits)))
/** The key share being sent to or received from the peer. /** The key share being sent to or received from the peer.
* *
* Unless the documentation of the PAKE algorithm says otherwise this is a * Unless the documentation of the PAKE algorithm says otherwise this is a
@ -2572,7 +2552,6 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
*/ */
#define PSA_PAKE_DATA_KEY_SHARE ((psa_pake_data_t)0x01) #define PSA_PAKE_DATA_KEY_SHARE ((psa_pake_data_t)0x01)
/** A Schnorr NIZKP public key. /** A Schnorr NIZKP public key.
* *
* This is a group element. * This is a group element.
@ -2587,7 +2566,6 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key )
*/ */
#define PSA_PAKE_DATA_ZK_PUBLIC ((psa_pake_data_t)0x02) #define PSA_PAKE_DATA_ZK_PUBLIC ((psa_pake_data_t)0x02)
/** A Schnorr NIZKP proof. /** A Schnorr NIZKP proof.
* *
* This is a scalar value. * This is a scalar value.