mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-25 16:05:43 +01:00
Remove ecp_group_read_string()
This commit is contained in:
parent
23ee4d65a3
commit
aff37e5aa1
@ -60,6 +60,7 @@ API Changes
|
|||||||
* Some constness fixes
|
* Some constness fixes
|
||||||
|
|
||||||
Removals
|
Removals
|
||||||
|
* Removed mbedtls_ecp_group_read_string(). Only named groups are supported.
|
||||||
* Removed individual mdX_hmac and shaX_hmac functions (use generic
|
* Removed individual mdX_hmac and shaX_hmac functions (use generic
|
||||||
md_hmac functions from md.h)
|
md_hmac functions from md.h)
|
||||||
* Removed the PBKDF2 module (use PKCS5).
|
* Removed the PBKDF2 module (use PKCS5).
|
||||||
@ -99,7 +100,7 @@ Default behavior changes
|
|||||||
* Default DHM parameters server-side upgraded from 1024 to 2048 bits.
|
* Default DHM parameters server-side upgraded from 1024 to 2048 bits.
|
||||||
* Negotiation of truncated HMAC is now disabled by default on server too.
|
* Negotiation of truncated HMAC is now disabled by default on server too.
|
||||||
|
|
||||||
Reauirement changes
|
Requirement changes
|
||||||
* The minimum MSVC version required is now 2010 (better C99 support).
|
* The minimum MSVC version required is now 2010 (better C99 support).
|
||||||
* The NET layer now unconditionnaly relies on getaddrinfo().
|
* The NET layer now unconditionnaly relies on getaddrinfo().
|
||||||
* Compiler is required to support C99 types such as long long and uint32_t.
|
* Compiler is required to support C99 types such as long long and uint32_t.
|
||||||
|
@ -437,25 +437,6 @@ int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp
|
|||||||
int format, size_t *olen,
|
int format, size_t *olen,
|
||||||
unsigned char *buf, size_t blen );
|
unsigned char *buf, size_t blen );
|
||||||
|
|
||||||
/**
|
|
||||||
* \brief Import an ECP group from null-terminated ASCII strings
|
|
||||||
*
|
|
||||||
* \param grp Destination group
|
|
||||||
* \param radix Input numeric base
|
|
||||||
* \param p Prime modulus of the base field
|
|
||||||
* \param b Constant term in the equation
|
|
||||||
* \param gx The generator's X coordinate
|
|
||||||
* \param gy The generator's Y coordinate
|
|
||||||
* \param n The generator's order
|
|
||||||
*
|
|
||||||
* \return 0 if successful, or a MBEDTLS_ERR_MPI_XXX error code
|
|
||||||
*
|
|
||||||
* \note Sets all fields except modp.
|
|
||||||
*/
|
|
||||||
int mbedtls_ecp_group_read_string( mbedtls_ecp_group *grp, int radix,
|
|
||||||
const char *p, const char *b,
|
|
||||||
const char *gx, const char *gy, const char *n);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Set a group using well-known domain parameters
|
* \brief Set a group using well-known domain parameters
|
||||||
*
|
*
|
||||||
@ -466,8 +447,8 @@ int mbedtls_ecp_group_read_string( mbedtls_ecp_group *grp, int radix,
|
|||||||
* MBEDTLS_ERR_MPI_XXX if initialization failed
|
* MBEDTLS_ERR_MPI_XXX if initialization failed
|
||||||
* MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE for unkownn groups
|
* MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE for unkownn groups
|
||||||
*
|
*
|
||||||
* \note Index should be a value of RFC 4492's enum NamdeCurve,
|
* \note Index should be a value of RFC 4492's enum NamedCurve,
|
||||||
* possibly in the form of a MBEDTLS_ECP_DP_XXX macro.
|
* usually in the form of a MBEDTLS_ECP_DP_XXX macro.
|
||||||
*/
|
*/
|
||||||
int mbedtls_ecp_use_known_dp( mbedtls_ecp_group *grp, mbedtls_ecp_group_id index );
|
int mbedtls_ecp_use_known_dp( mbedtls_ecp_group *grp, mbedtls_ecp_group_id index );
|
||||||
|
|
||||||
|
@ -583,30 +583,6 @@ int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp
|
|||||||
return( 0 );
|
return( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Import an ECP group from ASCII strings, case A == -3
|
|
||||||
*/
|
|
||||||
int mbedtls_ecp_group_read_string( mbedtls_ecp_group *grp, int radix,
|
|
||||||
const char *p, const char *b,
|
|
||||||
const char *gx, const char *gy, const char *n)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->P, radix, p ) );
|
|
||||||
MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->B, radix, b ) );
|
|
||||||
MBEDTLS_MPI_CHK( mbedtls_ecp_point_read_string( &grp->G, radix, gx, gy ) );
|
|
||||||
MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->N, radix, n ) );
|
|
||||||
|
|
||||||
grp->pbits = mbedtls_mpi_msb( &grp->P );
|
|
||||||
grp->nbits = mbedtls_mpi_msb( &grp->N );
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
if( ret != 0 )
|
|
||||||
mbedtls_ecp_group_free( grp );
|
|
||||||
|
|
||||||
return( ret );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set a group from an ECParameters record (RFC 4492)
|
* Set a group from an ECParameters record (RFC 4492)
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user