From 74468336266a0893c2c3c6735a3d79406d4c7853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 21 Oct 2013 13:56:40 +0200 Subject: [PATCH] Fix endianness issue in test helper function --- tests/suites/helpers.function | 68 ++++++++++++-------------- tests/suites/test_suite_ecdh.function | 5 +- tests/suites/test_suite_ecdsa.function | 3 +- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index 881a0ac6f..b3349546d 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -2,6 +2,14 @@ #include "polarssl/memory.h" #endif +#if defined(WANT_NOT_RND_MPI) +#if defined(POLARSSL_BIGNUM_C) +#include "polarssl/bignum.h" +#else +#error "not_rnd_mpi() need bignum.c" +#endif +#endif + #ifdef _MSC_VER #include typedef UINT32 uint32_t; @@ -225,48 +233,36 @@ static int rnd_pseudo_rand( void *rng_state, unsigned char *output, size_t len ) return( 0 ); } +#if defined(WANT_NOT_RND_MPI) /** - * This function returns a buffer given as a hex string. + * NOT random function, to match test vectors. * - * The buffer is reversed so that the following are equivalent: - * mpi_fill_random( x, len, not_rnd, str ); + * The following are equivalent: + * mpi_fill_random( x, strlen( str ) / 2, not_rnd, str ); * mpi_read_string( x, 16, str ); - * (So, not random at all. Usefull to match test vectors.) - * Based on unhexify(), just reversed (changes marked by "sic") + * Warning: no other use is supported! */ -static int not_rnd( void *in, unsigned char *out, size_t len ) +#define ciL (sizeof(t_uint)) /* chars in limb */ +#define CHARS_TO_LIMBS(i) (((i) + ciL - 1) / ciL) +static int not_rnd_mpi( void *in, unsigned char *out, size_t len ) { - unsigned char *obuf; - const char *ibuf = in; - unsigned char c, c2; - assert( len == strlen(ibuf) / 2 ); - assert(!(strlen(ibuf) %1)); // must be even number of bytes + char *str = (char *) in; + mpi X; - obuf = out + (len - 1); // sic - while (*ibuf != 0) - { - c = *ibuf++; - if( c >= '0' && c <= '9' ) - c -= '0'; - else if( c >= 'a' && c <= 'f' ) - c -= 'a' - 10; - else if( c >= 'A' && c <= 'F' ) - c -= 'A' - 10; - else - assert( 0 ); + /* + * The 'in' pointer we get is from an MPI prepared by mpi_fill_random(), + * just reconstruct the rest in order to be able to call mpi_read_string() + */ + X.s = 1; + X.p = (t_uint *) out; + X.n = CHARS_TO_LIMBS( len ); - c2 = *ibuf++; - if( c2 >= '0' && c2 <= '9' ) - c2 -= '0'; - else if( c2 >= 'a' && c2 <= 'f' ) - c2 -= 'a' - 10; - else if( c2 >= 'A' && c2 <= 'F' ) - c2 -= 'A' - 10; - else - assert( 0 ); + /* + * If str is too long, mpi_read_string() will try to allocate a new buffer + * for X.p, which we want to avoid at all costs. + */ + assert( strlen( str ) / 2 == len ); - *obuf-- = ( c << 4 ) | c2; // sic - } - - return( 0 ); + return( mpi_read_string( &X, 16, str ) ); } +#endif /* WANT_NOT_RND_MPI */ diff --git a/tests/suites/test_suite_ecdh.function b/tests/suites/test_suite_ecdh.function index ba35c76a7..63917d759 100644 --- a/tests/suites/test_suite_ecdh.function +++ b/tests/suites/test_suite_ecdh.function @@ -1,5 +1,6 @@ /* BEGIN_HEADER */ #include +#define WANT_NOT_RND_MPI /* END_HEADER */ /* BEGIN_DEPENDENCIES @@ -57,14 +58,14 @@ void ecdh_primitive_testvec( int id, char *dA_str, char *xA_str, char *yA_str, TEST_ASSERT( ecp_use_known_dp( &grp, id ) == 0 ); - TEST_ASSERT( ecdh_gen_public( &grp, &dA, &qA, ¬_rnd, dA_str ) == 0 ); + TEST_ASSERT( ecdh_gen_public( &grp, &dA, &qA, ¬_rnd_mpi, dA_str ) == 0 ); TEST_ASSERT( ! ecp_is_zero( &qA ) ); TEST_ASSERT( mpi_read_string( &check, 16, xA_str ) == 0 ); TEST_ASSERT( mpi_cmp_mpi( &qA.X, &check ) == 0 ); TEST_ASSERT( mpi_read_string( &check, 16, yA_str ) == 0 ); TEST_ASSERT( mpi_cmp_mpi( &qA.Y, &check ) == 0 ); - TEST_ASSERT( ecdh_gen_public( &grp, &dB, &qB, ¬_rnd, dB_str ) == 0 ); + TEST_ASSERT( ecdh_gen_public( &grp, &dB, &qB, ¬_rnd_mpi, dB_str ) == 0 ); TEST_ASSERT( ! ecp_is_zero( &qB ) ); TEST_ASSERT( mpi_read_string( &check, 16, xB_str ) == 0 ); TEST_ASSERT( mpi_cmp_mpi( &qB.X, &check ) == 0 ); diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function index 5ccb39d55..34307cac6 100644 --- a/tests/suites/test_suite_ecdsa.function +++ b/tests/suites/test_suite_ecdsa.function @@ -1,5 +1,6 @@ /* BEGIN_HEADER */ #include +#define WANT_NOT_RND_MPI /* END_HEADER */ /* BEGIN_DEPENDENCIES @@ -63,7 +64,7 @@ void ecdsa_prim_test_vectors( int id, char *d_str, char *xQ_str, char *yQ_str, len = unhexify(buf, hash_str); TEST_ASSERT( ecdsa_sign( &grp, &r, &s, &d, buf, len, - ¬_rnd, k_str ) == 0 ); + ¬_rnd_mpi, k_str ) == 0 ); TEST_ASSERT( mpi_cmp_mpi( &r, &r_check ) == 0 ); TEST_ASSERT( mpi_cmp_mpi( &s, &s_check ) == 0 );