yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename ecp_check_prvkey with a 'i' for consistency

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-09 16:05:52 +02:00
parent 81c313ccc6
commit de44a4aecf
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/polarssl/ecp.h
View file

@ -454,7 +454,7 @@ int ecp_check_pubkey( const ecp_group *grp, const ecp_point *pt );
* in order to ease use with other structures such as * in order to ease use with other structures such as
* ecdh_context of ecdsa_context. * ecdh_context of ecdsa_context.
*/ */
int ecp_check_prvkey( const ecp_group *grp, const mpi *d ); int ecp_check_privkey( const ecp_group *grp, const mpi *d );
/** /**
* \brief Generate a keypair * \brief Generate a keypair

2
library/ecp.c
View file

@ -1308,7 +1308,7 @@ cleanup:
/* /*
* Check that an mpi is valid as a private key (SEC1 3.2) * Check that an mpi is valid as a private key (SEC1 3.2)
*/ */
int ecp_check_prvkey( const ecp_group *grp, const mpi *d ) int ecp_check_privkey( const ecp_group *grp, const mpi *d )
{ {
/* We want 1 <= d <= N-1 */ /* We want 1 <= d <= N-1 */
if ( mpi_cmp_int( d, 1 ) < 0 || mpi_cmp_mpi( d, &grp->N ) >= 0 ) if ( mpi_cmp_int( d, 1 ) < 0 || mpi_cmp_mpi( d, &grp->N ) >= 0 )

4
library/x509parse.c
View file

@ -2731,7 +2731,7 @@ static int x509parse_key_sec1_der( ecp_keypair *eck,
return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret ); return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
} }
if( ( ret = ecp_check_prvkey( &eck->grp, &eck->d ) ) != 0 ) if( ( ret = ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
{ {
ecp_keypair_free( eck ); ecp_keypair_free( eck );
return( ret ); return( ret );
@ -2823,7 +2823,7 @@ static int x509parse_key_pkcs8_unencrypted_der_ec(
return( ret ); return( ret );
} }
if( ( ret = ecp_check_prvkey( &eck->grp, &eck->d ) ) != 0 ) if( ( ret = ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
{ {
ecp_keypair_free( eck ); ecp_keypair_free( eck );
return( ret ); return( ret );

2
tests/suites/test_suite_x509parse.function
View file

@ -220,7 +220,7 @@ x509parse_keyfile_ec:key_file:password:result
ecp_keypair *eckey; ecp_keypair *eckey;
TEST_ASSERT( ctx.type == POLARSSL_PK_ECKEY ); TEST_ASSERT( ctx.type == POLARSSL_PK_ECKEY );
eckey = (ecp_keypair *) ctx.data; eckey = (ecp_keypair *) ctx.data;
TEST_ASSERT( ecp_check_prvkey( &eckey->grp, &eckey->d ) == 0 ); TEST_ASSERT( ecp_check_privkey( &eckey->grp, &eckey->d ) == 0 );
} }
pk_free( &ctx ); pk_free( &ctx );