mbedtls_test_read_mpi_core: allow odd number of hex digits

Test functions must now take a char* argument rather than data_t*. This does
not affect existing test data.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-10-09 21:14:09 +02:00
parent 1b5c85c75b
commit c5772a194e
4 changed files with 38 additions and 10 deletions

View file

@ -298,12 +298,13 @@ void mbedtls_test_err_add_check( int high, int low,
* of limbs is 0. * of limbs is 0.
* \param[out] plimbs The address where the number of limbs will be stored. * \param[out] plimbs The address where the number of limbs will be stored.
* \param[in] input The test argument to read. * \param[in] input The test argument to read.
* It is interpreted as a big-endian integer in base 256. * It is interpreted as a hexadecimal representation
* of a non-negative integer.
* *
* \return \c 0 on success, an \c MBEDTLS_ERR_MPI_xxx error code otherwise. * \return \c 0 on success, an \c MBEDTLS_ERR_MPI_xxx error code otherwise.
*/ */
int mbedtls_test_read_mpi_core( mbedtls_mpi_uint **pX, size_t *plimbs, int mbedtls_test_read_mpi_core( mbedtls_mpi_uint **pX, size_t *plimbs,
const data_t *input ); const char *input );
/** Read an MPI from a hexadecimal string. /** Read an MPI from a hexadecimal string.
* *

View file

@ -348,19 +348,46 @@ void mbedtls_test_err_add_check( int high, int low,
#include "bignum_core.h" #include "bignum_core.h"
int mbedtls_test_read_mpi_core( mbedtls_mpi_uint **pX, size_t *plimbs, int mbedtls_test_read_mpi_core( mbedtls_mpi_uint **pX, size_t *plimbs,
const data_t *input ) const char *input )
{ {
/* Sanity check */ /* Sanity check */
if( *pX != NULL ) if( *pX != NULL )
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
*plimbs = CHARS_TO_LIMBS( input->len ); size_t hex_len = strlen( input );
size_t byte_len = ( hex_len + 1 ) / 2;
*plimbs = CHARS_TO_LIMBS( byte_len );
if( *plimbs == 0 ) if( *plimbs == 0 )
return( 0 ); return( 0 );
*pX = mbedtls_calloc( *plimbs, sizeof( **pX ) ); *pX = mbedtls_calloc( *plimbs, sizeof( **pX ) );
if( *pX == NULL ) if( *pX == NULL )
return( MBEDTLS_ERR_MPI_ALLOC_FAILED ); return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
return( mbedtls_mpi_core_read_be( *pX, *plimbs, input->x, input->len ) );
unsigned char *byte_start = ( unsigned char * ) *pX;
if( byte_len % sizeof( mbedtls_mpi_uint ) != 0 )
{
byte_start += sizeof( mbedtls_mpi_uint ) - byte_len % sizeof( mbedtls_mpi_uint );
}
if( ( hex_len & 1 ) != 0 )
{
/* mbedtls_test_unhexify wants an even number of hex digits */
TEST_ASSERT( ascii2uc( *input, byte_start ) == 0 );
++byte_start;
++input;
--byte_len;
}
TEST_ASSERT( mbedtls_test_unhexify( byte_start,
byte_len,
input,
&byte_len ) == 0 );
mbedtls_mpi_core_bigendian_to_host( *pX, *plimbs );
return( 0 );
exit:
mbedtls_free( *pX );
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
} }
int mbedtls_test_read_mpi( mbedtls_mpi *X, const char *s ) int mbedtls_test_read_mpi( mbedtls_mpi *X, const char *s )

View file

@ -595,13 +595,13 @@ Test mbedtls_mpi_cmp_mpi: large negative < 0 (1 limb)
mpi_cmp_mpi:"-1230000000000000000":"0":-1 mpi_cmp_mpi:"-1230000000000000000":"0":-1
mbedtls_mpi_core_lt_ct: x=y (1 limb) mbedtls_mpi_core_lt_ct: x=y (1 limb)
mpi_core_lt_ct:"02B5":"02B5":0 mpi_core_lt_ct:"2B5":"2B5":0
mbedtls_mpi_core_lt_ct: x>y (1 limb) mbedtls_mpi_core_lt_ct: x>y (1 limb)
mpi_core_lt_ct:"02B5":"02B4":0 mpi_core_lt_ct:"2B5":"2B4":0
mbedtls_mpi_core_lt_ct: x<y (1 limb) mbedtls_mpi_core_lt_ct: x<y (1 limb)
mpi_core_lt_ct:"02B5":"02B6":1 mpi_core_lt_ct:"2B5":"2B6":1
mbedtls_mpi_core_lt_ct: x=y (0 limbs) mbedtls_mpi_core_lt_ct: x=y (0 limbs)
mpi_core_lt_ct:"":"":0 mpi_core_lt_ct:"":"":0
@ -667,7 +667,7 @@ mbedtls_mpi_core_lt_ct: x<y (32 bit y, first bytes equal)
mpi_core_lt_ct:"000000FF":"FFFFFFFF":1 mpi_core_lt_ct:"000000FF":"FFFFFFFF":1
mbedtls_mpi_core_lt_ct: x<y, zero vs non-zero MS limb mbedtls_mpi_core_lt_ct: x<y, zero vs non-zero MS limb
mpi_core_lt_ct:"00FFFFFFFFFFFFFFFF":"01FFFFFFFFFFFFFFFF":1 mpi_core_lt_ct:"0FFFFFFFFFFFFFFFF":"1FFFFFFFFFFFFFFFF":1
mbedtls_mpi_core_lt_ct: x>y, equal MS limbs mbedtls_mpi_core_lt_ct: x>y, equal MS limbs
mpi_core_lt_ct:"EEFFFFFFFFFFFFFFFF":"EEFFFFFFFFFFFFFFF1":0 mpi_core_lt_ct:"EEFFFFFFFFFFFFFFFF":"EEFFFFFFFFFFFFFFF1":0

View file

@ -728,7 +728,7 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_core_lt_ct( data_t * input_X, data_t * input_Y, int exp_ret ) void mpi_core_lt_ct( char *input_X, char *input_Y, int exp_ret )
{ {
mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *X = NULL;
size_t X_limbs; size_t X_limbs;