Possible naming collision in dhm_context

This commit is contained in:
Paul Bakker 2013-10-11 09:38:49 +02:00
parent fcc172138c
commit d61cc3b246
3 changed files with 5 additions and 4 deletions

View file

@ -9,6 +9,7 @@ Bugfix
* Compile errors with POLARSSL_RSA_NO_CRT * Compile errors with POLARSSL_RSA_NO_CRT
* Header files with 'polarssl/' * Header files with 'polarssl/'
* Const correctness * Const correctness
* Possible naming collision in dhm_context
= PolarSSL-1.3.0 released on 2013-10-01 = PolarSSL-1.3.0 released on 2013-10-01
Features Features

View file

@ -152,7 +152,7 @@ typedef struct
mpi RP; /*!< cached R^2 mod P */ mpi RP; /*!< cached R^2 mod P */
mpi Vi; /*!< blinding value */ mpi Vi; /*!< blinding value */
mpi Vf; /*!< un-blinding value */ mpi Vf; /*!< un-blinding value */
mpi _X; /*!< previous X */ mpi pX; /*!< previous X */
} }
dhm_context; dhm_context;

View file

@ -276,9 +276,9 @@ static int dhm_update_blinding( dhm_context *ctx,
* Don't use any blinding the first time a particular X is used, * Don't use any blinding the first time a particular X is used,
* but remember it to use blinding next time. * but remember it to use blinding next time.
*/ */
if( mpi_cmp_mpi( &ctx->X, &ctx->_X ) != 0 ) if( mpi_cmp_mpi( &ctx->X, &ctx->pX ) != 0 )
{ {
MPI_CHK( mpi_copy( &ctx->_X, &ctx->X ) ); MPI_CHK( mpi_copy( &ctx->pX, &ctx->X ) );
MPI_CHK( mpi_lset( &ctx->Vi, 1 ) ); MPI_CHK( mpi_lset( &ctx->Vi, 1 ) );
MPI_CHK( mpi_lset( &ctx->Vf, 1 ) ); MPI_CHK( mpi_lset( &ctx->Vf, 1 ) );
@ -384,7 +384,7 @@ cleanup:
*/ */
void dhm_free( dhm_context *ctx ) void dhm_free( dhm_context *ctx )
{ {
mpi_free( &ctx->_X); mpi_free( &ctx->Vf ); mpi_free( &ctx->Vi ); mpi_free( &ctx->pX); mpi_free( &ctx->Vf ); mpi_free( &ctx->Vi );
mpi_free( &ctx->RP ); mpi_free( &ctx->K ); mpi_free( &ctx->GY ); mpi_free( &ctx->RP ); mpi_free( &ctx->K ); mpi_free( &ctx->GY );
mpi_free( &ctx->GX ); mpi_free( &ctx->X ); mpi_free( &ctx->G ); mpi_free( &ctx->GX ); mpi_free( &ctx->X ); mpi_free( &ctx->G );
mpi_free( &ctx->P ); mpi_free( &ctx->P );