From c618195bc42279b0a3a7ee5396b45591badc195b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 11 Aug 2015 14:33:51 +0200 Subject: [PATCH] Fix base point in ecjpake_write_zkp() --- library/ecjpake.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/ecjpake.c b/library/ecjpake.c index 7dc780ca93..3046154f6a 100644 --- a/library/ecjpake.c +++ b/library/ecjpake.c @@ -146,8 +146,8 @@ static int ecjpake_write_zkp( const mbedtls_md_info_t *md_info, mbedtls_mpi_init( &h ); /* Compute signature */ - MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair( (mbedtls_ecp_group *) grp, - &v, &V, f_rng, p_rng ) ); /* TODO: wrong base point! */ + MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair_base( (mbedtls_ecp_group *) grp, + G, &v, &V, f_rng, p_rng ) ); MBEDTLS_MPI_CHK( ecjpake_hash( md_info, grp, G, &V, X, id, &h ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &h, &h, x ) ); /* x*h */ MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &h, &v, &h ) ); /* v - x*h */ @@ -295,8 +295,8 @@ int mbedtls_ecjpake_self_test( int verbose ) if( verbose != 0 ) mbedtls_printf( " ECJPAKE test #2 (zkp, WIP): " ); - MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair( &grp, &x, &X, - ecjpake_lgc, NULL ) ); + MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair_base( &grp, &G, &x, &X, + ecjpake_lgc, NULL ) ); p = buf; MBEDTLS_MPI_CHK( ecjpake_write_zkp( md_info, &grp, &G, &x, &X, "client",