Skip to content

Commit ad5aaf4

Browse files
committed
Move the EC curves and DH groups into a separate API reference section.
1 parent 214064e commit ad5aaf4

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

include/psa/crypto_types.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ typedef int32_t psa_status_t;
6565
*/
6666
typedef uint32_t psa_key_type_t;
6767

68+
/**@}*/
69+
70+
/** \defgroup iana_groups TLS Supported Groups
71+
* @{
72+
*/
73+
6874
/** The type of PSA elliptic curve identifiers.
6975
*
7076
* The curve identifier is required to create an ECC key using the
@@ -119,6 +125,12 @@ typedef uint16_t psa_ecc_curve_t;
119125
*/
120126
typedef uint16_t psa_dh_group_t;
121127

128+
/**@}*/
129+
130+
/** \defgroup crypto_types Key and algorithm types
131+
* @{
132+
*/
133+
122134
/** \brief Encoding of a cryptographic algorithm.
123135
*
124136
* For algorithms that can be applied to multiple key types, this type

include/psa/crypto_values.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,12 @@
455455
((type) & PSA_KEY_TYPE_ECC_CURVE_MASK) : \
456456
0))
457457

458+
/**@}*/
459+
460+
/** \defgroup iana_groups TLS Supported Groups
461+
* @{
462+
*/
463+
458464
/* The encoding of curve identifiers is currently aligned with the
459465
* TLS Supported Groups Registry (formerly known as the
460466
* TLS EC Named Curve Registry)
@@ -516,6 +522,12 @@
516522
*/
517523
#define PSA_ECC_CURVE_VENDOR_MAX ((psa_ecc_curve_t) 0xfe7f)
518524

525+
/**@}*/
526+
527+
/** \defgroup crypto_types Key and algorithm types
528+
* @{
529+
*/
530+
519531
#define PSA_KEY_TYPE_DH_PUBLIC_KEY_BASE ((psa_key_type_t)0x60040000)
520532
#define PSA_KEY_TYPE_DH_KEY_PAIR_BASE ((psa_key_type_t)0x70040000)
521533
#define PSA_KEY_TYPE_DH_GROUP_MASK ((psa_key_type_t)0x0000ffff)
@@ -553,6 +565,12 @@
553565
((type) & PSA_KEY_TYPE_DH_GROUP_MASK) : \
554566
0))
555567

568+
/**@}*/
569+
570+
/** \defgroup iana_groups TLS Supported Groups
571+
* @{
572+
*/
573+
556574
/* The encoding of group identifiers is currently aligned with the
557575
* TLS Supported Groups Registry (formerly known as the
558576
* TLS EC Named Curve Registry)
@@ -577,6 +595,12 @@
577595
*/
578596
#define PSA_DH_GROUP_VENDOR_MAX ((psa_dh_group_t) 0x01fd)
579597

598+
/**@}*/
599+
600+
/** \defgroup crypto_types Key and algorithm types
601+
* @{
602+
*/
603+
580604
/** The block size of a block cipher.
581605
*
582606
* \param type A cipher key type (value of type #psa_key_type_t).

0 commit comments

Comments
 (0)