From b505c2796c2aaacc4ab999066871b20263aa01a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 5 Nov 2012 17:27:54 +0100 Subject: [PATCH] Got first tests working, fixed ecp_copy() --- include/polarssl/ecp.h | 11 ++++-- library/ecp.c | 79 +++++++++++++++++++++++++++++++--------- programs/test/selftest.c | 5 +++ 3 files changed, 74 insertions(+), 21 deletions(-) diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h index 805e7b022..2bede2ca8 100644 --- a/include/polarssl/ecp.h +++ b/include/polarssl/ecp.h @@ -154,6 +154,11 @@ extern "C" { */ void ecp_point_init( ecp_point *pt ); +/** + * \brief Initialize a group (to something meaningless) + */ +void ecp_group_init( ecp_group *grp ); + /** * \brief Free the components of a point */ @@ -197,7 +202,7 @@ int ecp_point_read_string( ecp_point *P, int radix, * \brief Import an ECP group from null-terminated ASCII strings * * \param grp Destination group - * \param radix Input numric base + * \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 @@ -222,7 +227,7 @@ int ecp_group_read_string( ecp_group *grp, int radix, * POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed, * POLARSSL_ERR_MPI_DIVISION_BY_ZERO (shouldn't happen) * (temporary, a faster version not using division will be - * used in the furture) + * used in the future) */ int ecp_add( const ecp_group *grp, ecp_point *R, const ecp_point *P, const ecp_point *Q ); @@ -239,7 +244,7 @@ int ecp_add( const ecp_group *grp, ecp_point *R, * POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed, * POLARSSL_ERR_MPI_DIVISION_BY_ZERO (shouldn't happen) * (temporary, a faster version not using division will be - * used in the furture) + * used in the future) */ int ecp_mul( const ecp_group *grp, ecp_point *R, const mpi *m, const ecp_point *P ); diff --git a/library/ecp.c b/library/ecp.c index a249ac565..242316b1a 100644 --- a/library/ecp.c +++ b/library/ecp.c @@ -37,7 +37,7 @@ #include "polarssl/ecp.h" /* - * Initialize a point + * Initialize (the components of) a point */ void ecp_point_init( ecp_point *pt ) { @@ -45,8 +45,22 @@ void ecp_point_init( ecp_point *pt ) return; pt->is_zero = 1; - mpi_init( &( pt->X ) ); - mpi_init( &( pt->Y ) ); + mpi_init( &pt->X ); + mpi_init( &pt->Y ); +} + +/* + * Initialize (the components of) a group + */ +void ecp_group_init( ecp_group *grp ) +{ + if( grp == NULL ) + return; + + mpi_init( &grp->P ); + mpi_init( &grp->B ); + ecp_point_init( &grp->G ); + mpi_init( &grp->N ); } /* @@ -82,8 +96,8 @@ void ecp_group_free( ecp_group *grp ) void ecp_set_zero( ecp_point *pt ) { pt->is_zero = 1; - mpi_free( &( pt->X ) ); - mpi_free( &( pt->Y ) ); + mpi_free( &pt->X ); + mpi_free( &pt->Y ); } /* @@ -93,6 +107,11 @@ int ecp_copy( ecp_point *P, const ecp_point *Q ) { int ret = 0; + if( Q->is_zero ) { + ecp_set_zero( P ); + return( ret ); + } + P->is_zero = Q->is_zero; MPI_CHK( mpi_copy( &P->X, &Q->X ) ); MPI_CHK( mpi_copy( &P->Y, &Q->Y ) ); @@ -256,26 +275,41 @@ static int ecp_point_eq( const ecp_point *P, const ecp_point *Q ) mpi_cmp_mpi( &P->Y, &Q->Y ) == 0 ); } +/* + * Print a point assuming its components are small + */ +static void ecp_point_print( const ecp_point *P ) +{ + if( P->is_zero ) + printf("zero\n"); + else + printf("(%lu, %lu)\n", P->X.p[0], P->Y.p[0]); +} + + /* * Checkup routine * - * Data gathered from http://danher6.100webspace.net/ecc/#EFp_interactivo - * and double-checked using Pari-GP + * Data for basic tests with small values gathered from + * http://danher6.100webspace.net/ecc/#EFp_interactivo and double-checked + * using Pari-GP. */ int ecp_self_test( int verbose ) { int ret = 0; - size_t i; + unsigned i; ecp_group grp; ecp_point O, A, B, C, D, E, F, G, TMP; - ecp_point add_table[][3] = + ecp_point *add_tbl[][3] = { - {O, O, O}, {O, A, A}, {A, O, A}, - {A, A, O}, {B, C, O}, {C, B, O}, - {A, D, E}, {D, A, E}, {B, D, F}, {D, B, F}, - {D, D, G}, + {&O, &O, &O}, }; + ecp_group_init( &grp ); + ecp_point_init( &O ); ecp_point_init( &A ); ecp_point_init( &B ); + ecp_point_init( &C ); ecp_point_init( &D ); ecp_point_init( &E ); + ecp_point_init( &F ); ecp_point_init( &G ); ecp_point_init( &TMP ); + ecp_set_zero( &O ); MPI_CHK( ecp_group_read_string( &grp, 10, "47", "4", "17", "42", "13" ) ); MPI_CHK( ecp_point_read_string( &A, 10, "13", "0" ) ); @@ -284,23 +318,32 @@ int ecp_self_test( int verbose ) MPI_CHK( ecp_point_read_string( &D, 10, "37", "31" ) ); MPI_CHK( ecp_point_read_string( &E, 10, "34", "14" ) ); MPI_CHK( ecp_point_read_string( &F, 10, "45", "7" ) ); - MPI_CHK( ecp_point_read_string( &E, 10, "21", "32" ) ); + MPI_CHK( ecp_point_read_string( &G, 10, "21", "32" ) ); if( verbose != 0 ) printf( " ECP test #1 (ecp_add): " ); - for( i = 0; i < sizeof( add_table ) / sizeof( add_table[0] ); i++ ) + for( i = 0; i < sizeof( add_tbl ) / sizeof( add_tbl[0] ); i++ ) { - MPI_CHK( ecp_add( &grp, &TMP, &add_table[i][0], &add_table[i][1] ) ); - if( ! ecp_point_eq( &TMP, &add_table[i][2] ) ) + MPI_CHK( ecp_add( &grp, &TMP, add_tbl[i][0], add_tbl[i][1] ) ); + if( ! ecp_point_eq( &TMP, add_tbl[i][2] ) ) { if( verbose != 0 ) - printf(" failed (%zu)\n", i); + { + printf(" failed\n"); + printf(" GOT: "); + ecp_point_print( &TMP ); + printf(" EXPECTED: "); + ecp_point_print( add_tbl[i][2] ); + } return( 1 ); } } + if (verbose != 0 ) + printf( " passed\n" ); + cleanup: if( ret != 0 && verbose != 0 ) diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 8dddf3481..98cc90ca3 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -155,6 +155,11 @@ int main( int argc, char *argv[] ) return( ret ); #endif +#if defined(POLARSSL_ECP_C) + if( ( ret = ecp_self_test( v ) ) != 0 ) + return( ret ); +#endif + #else printf( " POLARSSL_SELF_TEST not defined.\n" ); #endif