mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 05:35:28 +00:00
Start working on mod_p224
(Prototype, works only on 32-bit and little-endian 64-bit.)
This commit is contained in:
parent
cc67aee9c8
commit
e783f06f73
|
@ -543,6 +543,93 @@ cleanup:
|
|||
#undef LAST
|
||||
#endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */
|
||||
|
||||
#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
|
||||
|
||||
/* For now, prototype version for 32-bit or little-endian 64 bits only */
|
||||
|
||||
static inline void add32( uint32_t *dst, uint32_t src, signed char *carry )
|
||||
{
|
||||
*dst += src;
|
||||
*carry += ( *dst < src );
|
||||
}
|
||||
|
||||
static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
|
||||
{
|
||||
*carry -= ( *dst < src );
|
||||
*dst -= src;
|
||||
}
|
||||
|
||||
#define A( i ) ( ((uint32_t *) N->p)[i] )
|
||||
#define ADD( i ) add32( p, A( i ), &c );
|
||||
#define SUB( i ) sub32( p, A( i ), &c );
|
||||
|
||||
#define NEXT \
|
||||
p++; \
|
||||
cc = c; \
|
||||
c = 0; \
|
||||
if( cc < 0 ) \
|
||||
sub32( p, -cc, &c ); \
|
||||
else \
|
||||
add32( p, cc, &c );
|
||||
|
||||
#define LAST \
|
||||
p++; \
|
||||
*p = c > 0 ? c : 0; /* see fix_negative */ \
|
||||
while( ++p < end ) \
|
||||
*p = 0; \
|
||||
if( c < 0 ) fix_negative( N, c, bits );
|
||||
|
||||
/*
|
||||
* If the result is negative, we get it in the form c * 2^192 + N,
|
||||
* with c negative and N positive (the c >= 0 case is handled by LAST).
|
||||
*/
|
||||
static inline int fix_negative( mpi *N, signed char c, size_t bits )
|
||||
{
|
||||
int ret;
|
||||
mpi C;
|
||||
|
||||
mpi_init( &C );
|
||||
|
||||
MPI_CHK( mpi_lset( &C, c ) );
|
||||
MPI_CHK( mpi_shift_l( &C, bits ) );
|
||||
MPI_CHK( mpi_add_mpi( N, N, &C ) );
|
||||
|
||||
cleanup:
|
||||
mpi_free( &C );
|
||||
|
||||
return( ret );
|
||||
}
|
||||
|
||||
/*
|
||||
* Fast quasi-reduction modulo p224 (FIPS 186-3 D.2.2)
|
||||
*/
|
||||
static int ecp_mod_p224( mpi *N )
|
||||
{
|
||||
int ret;
|
||||
signed char c, cc;
|
||||
uint32_t *p, *end;
|
||||
size_t bits = 224;
|
||||
|
||||
/* Make sure we have the correct number of blocks */
|
||||
MPI_CHK( mpi_grow( N, bits * 2 / 8 / sizeof( t_uint ) ) );
|
||||
|
||||
/* Currently assuming 32-bit ints, or 64-bits little-endian */
|
||||
p = (uint32_t *) N->p;
|
||||
end = (uint32_t *) (N->p + N->n);
|
||||
|
||||
SUB( 7 ); SUB( 11 ); NEXT; // A0 += -A7 - A11
|
||||
SUB( 8 ); SUB( 12 ); NEXT; // A1 += -A8 - A12
|
||||
SUB( 9 ); SUB( 13 ); NEXT; // A2 += -A9 - A13
|
||||
SUB( 10 ); ADD( 7 ); ADD( 11 ); NEXT; // A3 += -A10 + A7 + A11
|
||||
SUB( 11 ); ADD( 8 ); ADD( 12 ); NEXT; // A4 += -A11 + A8 + A12
|
||||
SUB( 12 ); ADD( 9 ); ADD( 13 ); NEXT; // A5 += -A12 + A9 + A13
|
||||
SUB( 13 ); ADD( 10 ); LAST; // A6 += -A13 + A10
|
||||
|
||||
cleanup:
|
||||
return( ret );
|
||||
}
|
||||
#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED */
|
||||
|
||||
#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
|
||||
/*
|
||||
* Size of p521 in terms of t_uint
|
||||
|
@ -761,6 +848,7 @@ int ecp_use_known_dp( ecp_group *grp, ecp_group_id id )
|
|||
|
||||
#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
|
||||
case POLARSSL_ECP_DP_SECP224R1:
|
||||
grp->modp = ecp_mod_p224;
|
||||
return( ecp_group_read_string( grp, 16,
|
||||
SECP224R1_P, SECP224R1_B,
|
||||
SECP224R1_GX, SECP224R1_GY, SECP224R1_N ) );
|
||||
|
|
|
@ -273,6 +273,22 @@ ECP mod p192 (from a past failure case)
|
|||
depends_on:POLARSSL_ECP_DP_SECP192R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP192R1:"1AC2D6F96A2A425E9DD1776DD8368D4BBC86BF4964E79FEA713583BF948BBEFF0939F96FB19EC48C585BDA6A2D35C750"
|
||||
|
||||
ECP mod p224 readable without carry
|
||||
depends_on:POLARSSL_ECP_DP_SECP224R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP224R1:"0000000D0000000C0000000B0000000A0000000900000008000000070000FF060000FF050000FF040000FF03000FF0020000FF010000FF00"
|
||||
|
||||
ECP mod p224 readable with negative carry
|
||||
depends_on:POLARSSL_ECP_DP_SECP224R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP224R1:"0000000D0000000C0000000B0000000A00000009000000080000000700000006000000050000000400000003000000020000000100000000"
|
||||
|
||||
ECP mod p224 readable with positive carry
|
||||
depends_on:POLARSSL_ECP_DP_SECP224R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP224R1:"0000000D0000000C0000000BFFFFFF0AFFFFFF09FFFFFF08FFFFFF070000FF060000FF050000FF040000FF03000FF0020000FF010000FF00"
|
||||
|
||||
ECP mod p224 readable with final negative carry
|
||||
depends_on:POLARSSL_ECP_DP_SECP224R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP224R1:"FF00000D0000000C0000000B0000000A00000009000000080000000700000006000000050000000400000003000000020000000100000000"
|
||||
|
||||
ECP mod p521 very small
|
||||
depends_on:POLARSSL_ECP_DP_SECP521R1_ENABLED
|
||||
ecp_fast_mod:POLARSSL_ECP_DP_SECP521R1:"01"
|
||||
|
|
|
@ -229,8 +229,9 @@ void ecp_fast_mod( int id, char *N_str )
|
|||
mpi_init( &N ); mpi_init( &R );
|
||||
ecp_group_init( &grp );
|
||||
|
||||
TEST_ASSERT( ecp_use_known_dp( &grp, id ) == 0 );
|
||||
TEST_ASSERT( mpi_read_string( &N, 16, N_str ) == 0 );
|
||||
TEST_ASSERT( ecp_use_known_dp( &grp, id ) == 0 );
|
||||
TEST_ASSERT( grp.modp != NULL );
|
||||
|
||||
/*
|
||||
* Store correct result before we touch N
|
||||
|
|
Loading…
Reference in a new issue