From ff7fe670bbc33e5b5664dc609c92cbbb8b78e005 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Sun, 18 Jul 2010 09:45:05 +0000 Subject: [PATCH] - Minor DHM code cleanup/comments --- include/polarssl/dhm.h | 2 +- library/dhm.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h index f63eefd12..e80c45ed2 100644 --- a/include/polarssl/dhm.h +++ b/include/polarssl/dhm.h @@ -64,7 +64,7 @@ int dhm_read_params( dhm_context *ctx, * \brief Setup and write the ServerKeyExchange parameters * * \param ctx DHM context - * \param x_size private value size in bits + * \param x_size private value size in bytes * \param output destination buffer * \param olen number of chars written * \param f_rng RNG function diff --git a/library/dhm.c b/library/dhm.c index 1f179096f..904b5922f 100644 --- a/library/dhm.c +++ b/library/dhm.c @@ -99,20 +99,22 @@ int dhm_make_params( dhm_context *ctx, int x_size, unsigned char *p; /* - * generate X and calculate GX = G^X mod P + * Generate X as large as possible ( < P ) */ n = x_size / sizeof( t_int ); MPI_CHK( mpi_grow( &ctx->X, n ) ); MPI_CHK( mpi_lset( &ctx->X, 0 ) ); - n = x_size - 1; p = (unsigned char *) ctx->X.p; - for( i = 0; i < n; i++ ) + for( i = 0; i < x_size - 1; i++ ) *p++ = (unsigned char) f_rng( p_rng ); while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 ) mpi_shift_r( &ctx->X, 1 ); + /* + * Calculate GX = G^X mod P + */ MPI_CHK( mpi_exp_mod( &ctx->GX, &ctx->G, &ctx->X, &ctx->P , &ctx->RP ) );