Skip to content

Commit 819799c

Browse files
gilles-peskine-armgilles-peskine-arm
authored
Merge pull request #330 from gilles-peskine-arm/psa-streamline_encodings-types_and_curves
Streamline PSA key type and curve encodings
2 parents 350d4c3 + 3e819b7 commit 819799c

28 files changed

+766
-690
lines changed

‎docs/getting_started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ Mbed Crypto provides a simple way to generate a key or key pair.
865865
psa_set_key_algorithm(&attributes,
866866
PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_256));
867867
psa_set_key_type(&attributes,
868-
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1));
868+
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1));
869869
psa_set_key_bits(&attributes, key_bits);
870870
status = psa_generate_key(&attributes, &handle);
871871
if (status != PSA_SUCCESS) {

‎include/mbedtls/psa_util.h

Lines changed: 75 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -160,81 +160,96 @@ static inline psa_algorithm_t mbedtls_psa_translate_md( mbedtls_md_type_t md_alg
160160
/* Translations for ECC. */
161161

162162
static inline int mbedtls_psa_get_ecc_oid_from_id(
163-
psa_ecc_curve_t curve, char const **oid, size_t *oid_len )
163+
psa_ecc_curve_t curve, size_t bits,
164+
char const **oid, size_t *oid_len )
164165
{
165166
switch( curve )
166167
{
168+
case PSA_ECC_CURVE_SECP_R1:
169+
switch( bits )
170+
{
167171
#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
168-
case PSA_ECC_CURVE_SECP192R1:
169-
*oid = MBEDTLS_OID_EC_GRP_SECP192R1;
170-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP192R1 );
171-
return( 0 );
172+
case 192:
173+
*oid = MBEDTLS_OID_EC_GRP_SECP192R1;
174+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP192R1 );
175+
return( 0 );
172176
#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
173177
#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
174-
case PSA_ECC_CURVE_SECP224R1:
175-
*oid = MBEDTLS_OID_EC_GRP_SECP224R1;
176-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP224R1 );
177-
return( 0 );
178+
case 224:
179+
*oid = MBEDTLS_OID_EC_GRP_SECP224R1;
180+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP224R1 );
181+
return( 0 );
178182
#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
179183
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
180-
case PSA_ECC_CURVE_SECP256R1:
181-
*oid = MBEDTLS_OID_EC_GRP_SECP256R1;
182-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP256R1 );
183-
return( 0 );
184+
case 256:
185+
*oid = MBEDTLS_OID_EC_GRP_SECP256R1;
186+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP256R1 );
187+
return( 0 );
184188
#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
185189
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
186-
case PSA_ECC_CURVE_SECP384R1:
187-
*oid = MBEDTLS_OID_EC_GRP_SECP384R1;
188-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP384R1 );
189-
return( 0 );
190+
case 384:
191+
*oid = MBEDTLS_OID_EC_GRP_SECP384R1;
192+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP384R1 );
193+
return( 0 );
190194
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
191195
#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
192-
case PSA_ECC_CURVE_SECP521R1:
193-
*oid = MBEDTLS_OID_EC_GRP_SECP521R1;
194-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP521R1 );
195-
return( 0 );
196+
case 521:
197+
*oid = MBEDTLS_OID_EC_GRP_SECP521R1;
198+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP521R1 );
199+
return( 0 );
196200
#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
201+
}
202+
break;
203+
case PSA_ECC_CURVE_SECP_K1:
204+
switch( bits )
205+
{
197206
#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
198-
case PSA_ECC_CURVE_SECP192K1:
199-
*oid = MBEDTLS_OID_EC_GRP_SECP192K1;
200-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP192K1 );
201-
return( 0 );
207+
case 192:
208+
*oid = MBEDTLS_OID_EC_GRP_SECP192K1;
209+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP192K1 );
210+
return( 0 );
202211
#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
203212
#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
204-
case PSA_ECC_CURVE_SECP224K1:
205-
*oid = MBEDTLS_OID_EC_GRP_SECP224K1;
206-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP224K1 );
207-
return( 0 );
213+
case 224:
214+
*oid = MBEDTLS_OID_EC_GRP_SECP224K1;
215+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP224K1 );
216+
return( 0 );
208217
#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
209218
#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
210-
case PSA_ECC_CURVE_SECP256K1:
211-
*oid = MBEDTLS_OID_EC_GRP_SECP256K1;
212-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP256K1 );
213-
return( 0 );
219+
case 256:
220+
*oid = MBEDTLS_OID_EC_GRP_SECP256K1;
221+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_SECP256K1 );
222+
return( 0 );
214223
#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
224+
}
225+
break;
226+
case PSA_ECC_CURVE_BRAINPOOL_P_R1:
227+
switch( bits )
228+
{
215229
#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
216-
case PSA_ECC_CURVE_BRAINPOOL_P256R1:
217-
*oid = MBEDTLS_OID_EC_GRP_BP256R1;
218-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP256R1 );
219-
return( 0 );
230+
case 256:
231+
*oid = MBEDTLS_OID_EC_GRP_BP256R1;
232+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP256R1 );
233+
return( 0 );
220234
#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
221235
#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
222-
case PSA_ECC_CURVE_BRAINPOOL_P384R1:
223-
*oid = MBEDTLS_OID_EC_GRP_BP384R1;
224-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP384R1 );
225-
return( 0 );
236+
case 384:
237+
*oid = MBEDTLS_OID_EC_GRP_BP384R1;
238+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP384R1 );
239+
return( 0 );
226240
#endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
227241
#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
228-
case PSA_ECC_CURVE_BRAINPOOL_P512R1:
229-
*oid = MBEDTLS_OID_EC_GRP_BP512R1;
230-
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP512R1 );
231-
return( 0 );
242+
case 512:
243+
*oid = MBEDTLS_OID_EC_GRP_BP512R1;
244+
*oid_len = MBEDTLS_OID_SIZE( MBEDTLS_OID_EC_GRP_BP512R1 );
245+
return( 0 );
232246
#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
233-
default:
234-
(void) oid;
235-
(void) oid_len;
236-
return( -1 );
247+
}
248+
break;
237249
}
250+
(void) oid;
251+
(void) oid_len;
252+
return( -1 );
238253
}
239254

240255
#define MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH 1
@@ -317,67 +332,6 @@ static inline int mbedtls_psa_get_ecc_oid_from_id(
317332
#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
318333

319334

320-
static inline psa_ecc_curve_t mbedtls_psa_translate_ecc_group( mbedtls_ecp_group_id grpid )
321-
{
322-
switch( grpid )
323-
{
324-
#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
325-
case MBEDTLS_ECP_DP_SECP192R1:
326-
return( PSA_ECC_CURVE_SECP192R1 );
327-
#endif
328-
#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
329-
case MBEDTLS_ECP_DP_SECP224R1:
330-
return( PSA_ECC_CURVE_SECP224R1 );
331-
#endif
332-
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
333-
case MBEDTLS_ECP_DP_SECP256R1:
334-
return( PSA_ECC_CURVE_SECP256R1 );
335-
#endif
336-
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
337-
case MBEDTLS_ECP_DP_SECP384R1:
338-
return( PSA_ECC_CURVE_SECP384R1 );
339-
#endif
340-
#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
341-
case MBEDTLS_ECP_DP_SECP521R1:
342-
return( PSA_ECC_CURVE_SECP521R1 );
343-
#endif
344-
#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
345-
case MBEDTLS_ECP_DP_BP256R1:
346-
return( PSA_ECC_CURVE_BRAINPOOL_P256R1 );
347-
#endif
348-
#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
349-
case MBEDTLS_ECP_DP_BP384R1:
350-
return( PSA_ECC_CURVE_BRAINPOOL_P384R1 );
351-
#endif
352-
#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
353-
case MBEDTLS_ECP_DP_BP512R1:
354-
return( PSA_ECC_CURVE_BRAINPOOL_P512R1 );
355-
#endif
356-
#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
357-
case MBEDTLS_ECP_DP_CURVE25519:
358-
return( PSA_ECC_CURVE_CURVE25519 );
359-
#endif
360-
#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
361-
case MBEDTLS_ECP_DP_SECP192K1:
362-
return( PSA_ECC_CURVE_SECP192K1 );
363-
#endif
364-
#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
365-
case MBEDTLS_ECP_DP_SECP224K1:
366-
return( PSA_ECC_CURVE_SECP224K1 );
367-
#endif
368-
#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
369-
case MBEDTLS_ECP_DP_SECP256K1:
370-
return( PSA_ECC_CURVE_SECP256K1 );
371-
#endif
372-
#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
373-
case MBEDTLS_ECP_DP_CURVE448:
374-
return( PSA_ECC_CURVE_CURVE448 );
375-
#endif
376-
default:
377-
return( 0 );
378-
}
379-
}
380-
381335
/* Translations for PK layer */
382336

383337
static inline int mbedtls_psa_err_translate_pk( psa_status_t status )
@@ -411,13 +365,18 @@ static inline int mbedtls_psa_err_translate_pk( psa_status_t status )
411365
/* This function transforms an ECC group identifier from
412366
* https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
413367
* into a PSA ECC group identifier. */
414-
static inline psa_ecc_curve_t mbedtls_psa_parse_tls_ecc_group(
415-
uint16_t tls_ecc_grp_reg_id )
368+
#if defined(MBEDTLS_ECP_C)
369+
static inline psa_key_type_t mbedtls_psa_parse_tls_ecc_group(
370+
uint16_t tls_ecc_grp_reg_id, size_t *bits )
416371
{
417-
/* The PSA identifiers are currently aligned with those from
418-
* the TLS Supported Groups registry, so no conversion is necessary. */
419-
return( (psa_ecc_curve_t) tls_ecc_grp_reg_id );
372+
const mbedtls_ecp_curve_info *curve_info =
373+
mbedtls_ecp_curve_info_from_tls_id( tls_ecc_grp_reg_id );
374+
if( curve_info == NULL )
375+
return( 0 );
376+
return( PSA_KEY_TYPE_ECC_KEY_PAIR(
377+
mbedtls_ecc_group_to_psa( curve_info->grp_id, bits ) ) );
420378
}
379+
#endif /* MBEDTLS_ECP_C */
421380

422381
/* This function takes a buffer holding an EC public key
423382
* exported through psa_export_public_key(), and converts
@@ -444,15 +403,12 @@ static inline int mbedtls_psa_tls_psa_ec_to_ecpoint( unsigned char *src,
444403
* exchanges) and converts it into a format that the PSA key
445404
* agreement API understands.
446405
*/
447-
static inline int mbedtls_psa_tls_ecpoint_to_psa_ec( psa_ecc_curve_t curve,
448-
unsigned char const *src,
406+
static inline int mbedtls_psa_tls_ecpoint_to_psa_ec( unsigned char const *src,
449407
size_t srclen,
450408
unsigned char *dst,
451409
size_t dstlen,
452410
size_t *olen )
453411
{
454-
((void) curve);
455-
456412
if( srclen > dstlen )
457413
return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
458414

‎include/psa/crypto.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3502,10 +3502,10 @@ psa_status_t psa_key_derivation_output_bytes(
35023502
* length is determined by the curve, and sets the mandatory bits
35033503
* accordingly. That is:
35043504
*
3505-
* - #PSA_ECC_CURVE_CURVE25519: draw a 32-byte string
3506-
* and process it as specified in RFC 7748 §5.
3507-
* - #PSA_ECC_CURVE_CURVE448: draw a 56-byte string
3508-
* and process it as specified in RFC 7748 §5.
3505+
* - Curve25519 (#PSA_ECC_CURVE_MONTGOMERY, 255 bits): draw a 32-byte
3506+
* string and process it as specified in RFC 7748 §5.
3507+
* - Curve448 (#PSA_ECC_CURVE_MONTGOMERY, 448 bits): draw a 56-byte
3508+
* string and process it as specified in RFC 7748 §5.
35093509
*
35103510
* - For key types for which the key is represented by a single sequence of
35113511
* \p bits bits with constraints as to which bit sequences are acceptable,

‎include/psa/crypto_compat.h

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ extern "C" {
5050
typedef MBEDTLS_PSA_DEPRECATED size_t mbedtls_deprecated_size_t;
5151
typedef MBEDTLS_PSA_DEPRECATED psa_status_t mbedtls_deprecated_psa_status_t;
5252
typedef MBEDTLS_PSA_DEPRECATED psa_key_usage_t mbedtls_deprecated_psa_key_usage_t;
53+
typedef MBEDTLS_PSA_DEPRECATED psa_ecc_curve_t mbedtls_deprecated_psa_ecc_curve_t;
54+
typedef MBEDTLS_PSA_DEPRECATED psa_dh_group_t mbedtls_deprecated_psa_dh_group_t;
5355

5456
#define MBEDTLS_DEPRECATED_CONSTANT( type, value ) \
5557
( (mbedtls_deprecated_##type) ( value ) )
@@ -102,6 +104,81 @@ typedef MBEDTLS_PSA_DEPRECATED psa_key_usage_t mbedtls_deprecated_psa_key_usage_
102104

103105
#endif /* MBEDTLS_DEPRECATED_REMOVED */
104106

107+
/*
108+
* Size-specific elliptic curve and Diffie-Hellman group names
109+
*/
110+
#define PSA_ECC_CURVE_SECP160K1 \
111+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_K1 )
112+
#define PSA_ECC_CURVE_SECP192K1 \
113+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_K1 )
114+
#define PSA_ECC_CURVE_SECP224K1 \
115+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_K1 )
116+
#define PSA_ECC_CURVE_SECP256K1 \
117+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_K1 )
118+
#define PSA_ECC_CURVE_SECP160R1 \
119+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
120+
#define PSA_ECC_CURVE_SECP192R1 \
121+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
122+
#define PSA_ECC_CURVE_SECP224R1 \
123+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
124+
#define PSA_ECC_CURVE_SECP256R1 \
125+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
126+
#define PSA_ECC_CURVE_SECP384R1 \
127+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
128+
#define PSA_ECC_CURVE_SECP521R1 \
129+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R1 )
130+
#define PSA_ECC_CURVE_SECP160R2 \
131+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECP_R2 )
132+
#define PSA_ECC_CURVE_SECT163K1 \
133+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
134+
#define PSA_ECC_CURVE_SECT233K1 \
135+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
136+
#define PSA_ECC_CURVE_SECT239K1 \
137+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
138+
#define PSA_ECC_CURVE_SECT283K1 \
139+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
140+
#define PSA_ECC_CURVE_SECT409K1 \
141+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
142+
#define PSA_ECC_CURVE_SECT571K1 \
143+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_K1 )
144+
#define PSA_ECC_CURVE_SECT163R1 \
145+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
146+
#define PSA_ECC_CURVE_SECT193R1 \
147+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
148+
#define PSA_ECC_CURVE_SECT233R1 \
149+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
150+
#define PSA_ECC_CURVE_SECT283R1 \
151+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
152+
#define PSA_ECC_CURVE_SECT409R1 \
153+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
154+
#define PSA_ECC_CURVE_SECT571R1 \
155+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R1 )
156+
#define PSA_ECC_CURVE_SECT163R2 \
157+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R2 )
158+
#define PSA_ECC_CURVE_SECT193R2 \
159+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_SECT_R2 )
160+
#define PSA_ECC_CURVE_BRAINPOOL_P256R1 \
161+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_BRAINPOOL_P_R1 )
162+
#define PSA_ECC_CURVE_BRAINPOOL_P384R1 \
163+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_BRAINPOOL_P_R1 )
164+
#define PSA_ECC_CURVE_BRAINPOOL_P512R1 \
165+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_BRAINPOOL_P_R1 )
166+
#define PSA_ECC_CURVE_CURVE25519 \
167+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_MONTGOMERY )
168+
#define PSA_ECC_CURVE_CURVE448 \
169+
MBEDTLS_DEPRECATED_CONSTANT( psa_ecc_curve_t, PSA_ECC_CURVE_MONTGOMERY )
170+
171+
#define PSA_DH_GROUP_FFDHE2048 \
172+
MBEDTLS_DEPRECATED_CONSTANT( psa_dh_group_t, PSA_DH_GROUP_RFC7919 )
173+
#define PSA_DH_GROUP_FFDHE3072 \
174+
MBEDTLS_DEPRECATED_CONSTANT( psa_dh_group_t, PSA_DH_GROUP_RFC7919 )
175+
#define PSA_DH_GROUP_FFDHE4096 \
176+
MBEDTLS_DEPRECATED_CONSTANT( psa_dh_group_t, PSA_DH_GROUP_RFC7919 )
177+
#define PSA_DH_GROUP_FFDHE6144 \
178+
MBEDTLS_DEPRECATED_CONSTANT( psa_dh_group_t, PSA_DH_GROUP_RFC7919 )
179+
#define PSA_DH_GROUP_FFDHE8192 \
180+
MBEDTLS_DEPRECATED_CONSTANT( psa_dh_group_t, PSA_DH_GROUP_RFC7919 )
181+
105182
#ifdef __cplusplus
106183
}
107184
#endif

0 commit comments

Comments
 (0)