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

Change auxiliary functions for TLS to the new PSA EC curve encoding

Browse Source 
This is a change to an internal API that is exposed only for the sake
of Mbed TLS.
This commit is contained in:
Gilles Peskine 2019-12-18 20:44:49 +01:00
parent 80d26fb56f
commit d1959dcd4a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/mbedtls/psa_util.h
View File

@ -366,16 +366,15 @@ static inline int mbedtls_psa_err_translate_pk( psa_status_t status )
* https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
* into a PSA ECC group identifier. */ * into a PSA ECC group identifier. */
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
static inline psa_ecc_curve_t mbedtls_psa_parse_tls_ecc_group( static inline psa_key_type_t mbedtls_psa_parse_tls_ecc_group(
uint16_t tls_ecc_grp_reg_id ) uint16_t tls_ecc_grp_reg_id, size_t *bits )
{ {
size_t bits;
const mbedtls_ecp_curve_info *curve_info = const mbedtls_ecp_curve_info *curve_info =
mbedtls_ecp_curve_info_from_tls_id( tls_ecc_grp_reg_id ); mbedtls_ecp_curve_info_from_tls_id( tls_ecc_grp_reg_id );
if( curve_info == NULL ) if( curve_info == NULL )
return( 0 ); return( 0 );
else return( PSA_KEY_TYPE_ECC_KEY_PAIR(
return( mbedtls_ecc_group_to_psa( curve_info->grp_id, &bits ) ); mbedtls_ecc_group_to_psa( curve_info->grp_id, bits ) ) );
} }
#endif /* MBEDTLS_ECP_C */ #endif /* MBEDTLS_ECP_C */
@ -404,15 +403,12 @@ static inline int mbedtls_psa_tls_psa_ec_to_ecpoint( unsigned char *src,
* exchanges) and converts it into a format that the PSA key * exchanges) and converts it into a format that the PSA key
* agreement API understands. * agreement API understands.
*/ */
static inline int mbedtls_psa_tls_ecpoint_to_psa_ec( psa_ecc_curve_t curve, static inline int mbedtls_psa_tls_ecpoint_to_psa_ec( unsigned char const *src,
unsigned char const *src,
size_t srclen, size_t srclen,
unsigned char *dst, unsigned char *dst,
size_t dstlen, size_t dstlen,
size_t *olen ) size_t *olen )
{ {
((void) curve);
if( srclen > dstlen ) if( srclen > dstlen )
return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL ); return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );