diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2017-06-24 22:51:45 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2017-06-24 22:51:45 +0800 |
| commit | 6ac5ea2a9f8bad30909e30ed196879ddbd118310 (patch) | |
| tree | 4c43cdca57c6b70f2c509e6b15e269b13afa5ffc /libtommath/bn_mp_div_d.c | |
| parent | 17a9b8802f0306010f5d1f071dce2b3ca80ae415 (diff) | |
| parent | 364fb6019c1931de3d181f21ea491ec112161577 (diff) | |
merge from main (libtommath/libtomcrypt/curve25510-donna updates)
--HG--
branch : fuzz
Diffstat (limited to 'libtommath/bn_mp_div_d.c')
| -rw-r--r-- | libtommath/bn_mp_div_d.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libtommath/bn_mp_div_d.c b/libtommath/bn_mp_div_d.c index 771aa6a..4df1d36 100644 --- a/libtommath/bn_mp_div_d.c +++ b/libtommath/bn_mp_div_d.c @@ -1,4 +1,4 @@ -#include <tommath.h> +#include <tommath_private.h> #ifdef BN_MP_DIV_D_C /* LibTomMath, multiple-precision integer library -- Tom St Denis * @@ -12,14 +12,19 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com + * Tom St Denis, tstdenis82@gmail.com, http://libtom.org */ static int s_is_power_of_two(mp_digit b, int *p) { int x; - for (x = 1; x < DIGIT_BIT; x++) { + /* fast return if no power of two */ + if ((b == 0) || ((b & (b-1)) != 0)) { + return 0; + } + + for (x = 0; x < DIGIT_BIT; x++) { if (b == (((mp_digit)1)<<x)) { *p = x; return 1; @@ -42,7 +47,7 @@ int mp_div_d (mp_int * a, mp_digit b, mp_int * c, mp_digit * d) } /* quick outs */ - if (b == 1 || mp_iszero(a) == 1) { + if ((b == 1) || (mp_iszero(a) == MP_YES)) { if (d != NULL) { *d = 0; } @@ -105,6 +110,6 @@ int mp_div_d (mp_int * a, mp_digit b, mp_int * c, mp_digit * d) #endif -/* $Source: /cvs/libtom/libtommath/bn_mp_div_d.c,v $ */ -/* $Revision: 1.3 $ */ -/* $Date: 2006/03/31 14:18:44 $ */ +/* $Source$ */ +/* $Revision$ */ +/* $Date$ */ |