cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed incorrect handling of negative first input value in mpi_mod_mpi() and mpi_mod_int(). Resulting change also affects mpi_write_string() (found by code coverage tests).

Browse Source
This commit is contained in:
Paul Bakker 2009-06-23 19:46:08 +00:00
parent 1ef7a53fa2
commit ce40a6d21d
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -8,6 +8,10 @@ Bug fixes
value in mpi_add_abs() (found by code coverage tests). value in mpi_add_abs() (found by code coverage tests).
* Fixed incorrect handling of negative first input * Fixed incorrect handling of negative first input
value in mpi_sub_abs() (found by code coverage tests). value in mpi_sub_abs() (found by code coverage tests).
* Fixed incorrect handling of negative first input
value in mpi_mod_mpi() and mpi_mod_int(). Resulting
change also affects mpi_write_string() (found by code
coverage tests).
= Version 0.11.1 released on 2009-05-17 = Version 0.11.1 released on 2009-05-17
* Fixed missing functionality for SHA-224, SHA-256, SHA384, * Fixed missing functionality for SHA-224, SHA-256, SHA384,

8
include/polarssl/bignum.h
View File

@ -308,6 +308,8 @@ int mpi_mul_mpi( mpi *X, mpi *A, mpi *B );
/** /**
* \brief Baseline multiplication: X = A * b * \brief Baseline multiplication: X = A * b
* Note: b is an unsigned integer type, thus
* Negative values of b are ignored.
* *
* \return 0 if successful, * \return 0 if successful,
* 1 if memory allocation failed * 1 if memory allocation failed
@ -341,7 +343,8 @@ int mpi_div_int( mpi *Q, mpi *R, mpi *A, int b );
* *
* \return 0 if successful, * \return 0 if successful,
* 1 if memory allocation failed, * 1 if memory allocation failed,
* POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0 * POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0,
* POLARSSL_ERR_MPI_NEGATIVE_VALUE if B < 0
*/ */
int mpi_mod_mpi( mpi *R, mpi *A, mpi *B ); int mpi_mod_mpi( mpi *R, mpi *A, mpi *B );
@ -350,7 +353,8 @@ int mpi_mod_mpi( mpi *R, mpi *A, mpi *B );
* *
* \return 0 if successful, * \return 0 if successful,
* 1 if memory allocation failed, * 1 if memory allocation failed,
* POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0 * POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0,
* POLARSSL_ERR_MPI_NEGATIVE_VALUE if b < 0
*/ */
int mpi_mod_int( t_int *r, mpi *A, int b ); int mpi_mod_int( t_int *r, mpi *A, int b );

16
library/bignum.c
View File

@ -382,6 +382,10 @@ int mpi_write_string( mpi *X, int radix, char *s, int *slen )
else else
{ {
MPI_CHK( mpi_copy( &T, X ) ); MPI_CHK( mpi_copy( &T, X ) );
if( T.s == -1 )
T.s = 1;
MPI_CHK( mpi_write_hlp( &T, radix, &p ) ); MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
} }
@ -1180,6 +1184,9 @@ int mpi_mod_mpi( mpi *R, mpi *A, mpi *B )
{ {
int ret; int ret;
if( mpi_cmp_int( B, 0 ) < 0 )
return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
MPI_CHK( mpi_div_mpi( NULL, R, A, B ) ); MPI_CHK( mpi_div_mpi( NULL, R, A, B ) );
while( mpi_cmp_int( R, 0 ) < 0 ) while( mpi_cmp_int( R, 0 ) < 0 )
@ -1205,7 +1212,7 @@ int mpi_mod_int( t_int *r, mpi *A, int b )
return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO ); return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
if( b < 0 ) if( b < 0 )
b = -b; return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
/* /*
* handle trivial cases * handle trivial cases
@ -1238,6 +1245,13 @@ int mpi_mod_int( t_int *r, mpi *A, int b )
y -= z * b; y -= z * b;
} }
/*
* If A is negative, then the current y represents a negative value.
* Flipping it to the positive side.
*/
if( A->s < 0 && y != 0 )
y = b - y;
*r = y; *r = y;
return( 0 ); return( 0 );