diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-29 19:52:35 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-29 19:52:35 (GMT) |
commit | ff1658cbdd0982b1fe292259ef37bc9abb41a932 (patch) | |
tree | 915f0c4344c7f680ee86ba8cce24deb9b0b40bc2 /libtommath/bn_mp_rand.c | |
parent | 2adcff3e5ba6e09366ef4208ab81768803ba15bd (diff) | |
download | tcl-ff1658cbdd0982b1fe292259ef37bc9abb41a932.zip tcl-ff1658cbdd0982b1fe292259ef37bc9abb41a932.tar.gz tcl-ff1658cbdd0982b1fe292259ef37bc9abb41a932.tar.bz2 |
libtommath 1.0.1 rc 2
Diffstat (limited to 'libtommath/bn_mp_rand.c')
-rw-r--r-- | libtommath/bn_mp_rand.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/libtommath/bn_mp_rand.c b/libtommath/bn_mp_rand.c index 4c9610d..7c8f106 100644 --- a/libtommath/bn_mp_rand.c +++ b/libtommath/bn_mp_rand.c @@ -15,7 +15,32 @@ * Tom St Denis, tstdenis82@gmail.com, http://libtom.org */ +#if MP_GEN_RANDOM_MAX == 0xffffffff + #define MP_GEN_RANDOM_SHIFT 32 +#elif MP_GEN_RANDOM_MAX == 32767 + /* SHRT_MAX */ + #define MP_GEN_RANDOM_SHIFT 15 +#elif MP_GEN_RANDOM_MAX == 2147483647 + /* INT_MAX */ + #define MP_GEN_RANDOM_SHIFT 31 +#elif !defined(MP_GEN_RANDOM_SHIFT) +#error Thou shalt define their own valid MP_GEN_RANDOM_SHIFT +#endif + /* makes a pseudo-random int of a given size */ +static mp_digit s_gen_random(void) +{ + mp_digit d = 0, msk = 0; + do { + d <<= MP_GEN_RANDOM_SHIFT; + d |= ((mp_digit) MP_GEN_RANDOM()); + msk <<= MP_GEN_RANDOM_SHIFT; + msk |= (MP_MASK & MP_GEN_RANDOM_MAX); + } while ((MP_MASK & msk) != MP_MASK); + d &= MP_MASK; + return d; +} + int mp_rand (mp_int * a, int digits) { @@ -29,7 +54,7 @@ mp_rand (mp_int * a, int digits) /* first place a random non-zero digit */ do { - d = ((mp_digit) abs (MP_GEN_RANDOM())) & MP_MASK; + d = s_gen_random(); } while (d == 0); if ((res = mp_add_d (a, d, a)) != MP_OKAY) { @@ -41,7 +66,7 @@ mp_rand (mp_int * a, int digits) return res; } - if ((res = mp_add_d (a, ((mp_digit) abs (MP_GEN_RANDOM())), a)) != MP_OKAY) { + if ((res = mp_add_d (a, s_gen_random(), a)) != MP_OKAY) { return res; } } @@ -50,6 +75,6 @@ mp_rand (mp_int * a, int digits) } #endif -/* $Source$ */ -/* $Revision$ */ -/* $Date$ */ +/* ref: HEAD -> release/1.0.1, tag: v1.0.1-rc2 */ +/* git commit: e8c27ba7df0efb90708029115c94d681dfa7812f */ +/* commit time: 2017-08-29 10:48:46 +0200 */ |