move jenkins prng to bn_s_mp_rand_jenkins.c

Author: minad

.travis.yml

@@ -153,13 +153,13 @@ matrix:
 
     # GCC for the x86-64 architecture testing against a different Bigint-implementation
     # with 333333 different inputs.
-    - env: SANITIZER=1 BUILDOPTIONS='--with-cc=gcc-5 --test-vs-mtest=333333 --with-valgrind'
-    - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --test-vs-mtest=333333 --with-valgrind'
+    - env: BUILDOPTIONS='--with-cc=gcc-5 --test-vs-mtest=333333 --with-valgrind'
+    - env: BUILDOPTIONS='--with-cc=clang-7 --test-vs-mtest=333333 --with-valgrind'
 
     # clang for the x86-64 architecture testing against a different Bigint-implementation
     # with a better random source.
-    - env: SANITIZER=1 BUILDOPTIONS='--with-cc=gcc-5 --test-vs-mtest=333333 --mtest-real-rand --with-valgrind'
-    - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --test-vs-mtest=333333 --mtest-real-rand --with-valgrind'
+    - env: BUILDOPTIONS='--with-cc=gcc-5 --test-vs-mtest=333333 --mtest-real-rand --with-valgrind'
+    - env: BUILDOPTIONS='--with-cc=clang-7 --test-vs-mtest=333333 --mtest-real-rand --with-valgrind'
 
 
 # Notifications go to

bn_mp_rand.c

@@ -3,11 +3,11 @@
 /* LibTomMath, multiple-precision integer library -- Tom St Denis */
 /* SPDX-License-Identifier: Unlicense */
 
-int (*s_mp_rand_source)(void *, size_t) = s_mp_rand_source_platform;
+int (*s_mp_rand_source)(void *, size_t) = s_mp_rand_platform;
 
 void mp_rand_source(int (*source)(void *out, size_t size))
 {
-   s_mp_rand_source = (source == NULL) ? s_mp_rand_source_platform : source;
+   s_mp_rand_source = (source == NULL) ? s_mp_rand_platform : source;
 }
 
 /* makes a pseudo-random int of a given size */

bn_s_mp_rand_jenkins.c

@@ -0,0 +1,52 @@
+#include "tommath_private.h"
+#ifdef BN_S_MP_RAND_JENKINS_C
+/* LibTomMath, multiple-precision integer library -- Tom St Denis */
+/* SPDX-License-Identifier: Unlicense */
+
+/* Bob Jenkins' http://burtleburtle.net/bob/rand/smallprng.html */
+/* Chosen for speed and a good "mix" */
+typedef struct ranctx {
+   uint64_t a;
+   uint64_t b;
+   uint64_t c;
+   uint64_t d;
+} ranctx;
+
+static ranctx jenkins_x;
+
+#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
+static uint64_t s_rand_jenkins_val(void)
+{
+   uint64_t e = jenkins_x.a - rot(jenkins_x.b, 7);
+   jenkins_x.a = jenkins_x.b ^ rot(jenkins_x.c, 13);
+   jenkins_x.b = jenkins_x.c + rot(jenkins_x.d, 37);
+   jenkins_x.c = jenkins_x.d + e;
+   jenkins_x.d = e + jenkins_x.a;
+   return jenkins_x.d;
+}
+
+void s_mp_rand_jenkins_init(uint64_t seed)
+{
+   uint64_t i;
+   jenkins_x.a = 0xf1ea5eed;
+   jenkins_x.b = jenkins_x.c = jenkins_x.d = seed;
+   for (i = 0; i < 20; ++i) {
+      (void)s_rand_jenkins_val();
+   }
+}
+
+int s_mp_rand_jenkins(void *p, size_t n)
+{
+   char *q = (char *)p;
+   while (n > 0) {
+      int i;
+      uint64_t x = s_rand_jenkins_val();
+      for (i = 0; i < 8 && n > 0; ++i, --n) {
+         *q++ = (char)(x & 0xFF);
+         x >>= 8;
+      }
+   }
+   return MP_OKAY;
+}
+
+#endif

bn_s_mp_rand_source_platform.c bn_s_mp_rand_platform.cbn_s_mp_rand_source_platform.c renamed to bn_s_mp_rand_platform.c

@@ -1,5 +1,5 @@
 #include "tommath_private.h"
-#ifdef BN_S_MP_RAND_SOURCE_PLATFORM_C
+#ifdef BN_S_MP_RAND_PLATFORM_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis */
 /* SPDX-License-Identifier: Unlicense */
 
@@ -128,7 +128,7 @@ static int s_read_ltm_rng(void *p, size_t n)
 }
 #endif
 
-int s_mp_rand_source_platform(void *p, size_t n)
+int s_mp_rand_platform(void *p, size_t n)
 {
 #if defined(MP_ARC4RANDOM)
    arc4random_buf(p, n);

callgraph.txt

@@ -15360,7 +15360,10 @@ BN_S_MP_MUL_HIGH_DIGS_FAST_C
 +--->BN_MP_CLAMP_C
 
 
-BN_S_MP_RAND_SOURCE_PLATFORM_C
+BN_S_MP_RAND_JENKINS_C
+
+
+BN_S_MP_RAND_PLATFORM_C
 
 
 BN_S_MP_REVERSE_C

demo/main.c

@@ -26,8 +26,6 @@ void ndraw(mp_int *a, const char *name)
 
 int main(int argc, char **argv)
 {
-   srand(LTM_DEMO_RAND_SEED);
-
 #ifdef MP_8BIT
    printf("Digit size 8 Bit \n");
 #endif

demo/opponent.c

@@ -1,5 +1,11 @@
 #include "shared.h"
 
+#ifdef LTM_MTEST_REAL_RAND
+#define LTM_MTEST_RAND_SEED  time(NULL)
+#else
+#define LTM_MTEST_RAND_SEED  23
+#endif
+
 static void draw(mp_int *a)
 {
    ndraw(a, "");
@@ -21,6 +27,8 @@ int mtest_opponent(void)
    unsigned long expt_n, add_n, sub_n, mul_n, div_n, sqr_n, mul2d_n, div2d_n,
             gcd_n, lcm_n, inv_n, div2_n, mul2_n, add_d_n, sub_d_n;
 
+   srand(LTM_MTEST_RAND_SEED);
+
    if (mp_init_multi(&a, &b, &c, &d, &e, &f, NULL)!= MP_OKAY)
       return EXIT_FAILURE;
 

demo/shared.h

@@ -18,12 +18,6 @@
 #define LTM_DEMO_TEST_REDUCE_2K_L 0
 #endif
 
-#ifdef LTM_DEMO_REAL_RAND
-#define LTM_DEMO_RAND_SEED  time(NULL)
-#else
-#define LTM_DEMO_RAND_SEED  23
-#endif
-
 #define MP_WUR /* TODO: result checks disabled for now */
 #include "tommath.h"
 

demo/test.c

@@ -1,4 +1,25 @@
 #include "shared.h"
+#include "tommath_private.h"
+
+static long rand_long(void)
+{
+   long x;
+   if (s_mp_rand_source(&x, sizeof(x)) != MP_OKAY) {
+      fprintf(stderr, "s_mp_rand_source failed\n");
+      exit(EXIT_FAILURE);
+   }
+   return x;
+}
+
+static int rand_int(void)
+{
+   int x;
+   if (s_mp_rand_source(&x, sizeof(x)) != MP_OKAY) {
+      fprintf(stderr, "s_mp_rand_source failed\n");
+      exit(EXIT_FAILURE);
+   }
+   return x;
+}
 
 static int test_trivial_stuff(void)
 {
@@ -260,7 +281,7 @@ static int test_mp_complement(void)
    }
 
    for (i = 0; i < 1000; ++i) {
-      long l = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      long l = rand_long();
       mp_set_long(&a, (unsigned long)labs(l));
       if (l < 0)
          mp_neg(&a, &a);
@@ -297,12 +318,12 @@ static int test_mp_tc_div_2d(void)
       long l;
       int em;
 
-      l = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      l = rand_long();
       mp_set_long(&a, (unsigned long)labs(l));
       if (l < 0)
          mp_neg(&a, &a);
 
-      em = rand() % 32;
+      em = abs(rand_int()) % 32;
 
       mp_set_long(&d, (unsigned long)labs(l >> em));
       if ((l >> em) < 0)
@@ -333,14 +354,14 @@ static int test_mp_tc_xor(void)
    }
 
    for (i = 0; i < 1000; ++i) {
-      int l, em;
+      long l, em;
 
-      l = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      l = rand_long();
       mp_set_int(&a, (unsigned long)labs(l));
       if (l < 0)
          mp_neg(&a, &a);
 
-      em = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      em = rand_long();
       mp_set_int(&b, (unsigned long)labs(em));
       if (em < 0)
          mp_neg(&b, &b);
@@ -376,12 +397,12 @@ static int test_mp_tc_or(void)
    for (i = 0; i < 1000; ++i) {
       long l, em;
 
-      l = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      l = rand_long();
       mp_set_long(&a, (unsigned long)labs(l));
       if (l < 0)
          mp_neg(&a, &a);
 
-      em = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      em = rand_long();
       mp_set_long(&b, (unsigned long)labs(em));
       if (em < 0)
          mp_neg(&b, &b);
@@ -416,12 +437,12 @@ static int test_mp_tc_and(void)
    for (i = 0; i < 1000; ++i) {
       long l, em;
 
-      l = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      l = rand_long();
       mp_set_long(&a, (unsigned long)labs(l));
       if (l < 0)
          mp_neg(&a, &a);
 
-      em = ((long)rand() * rand() + 1) * (rand() % 1 ? -1 : 1);
+      em = rand_long();
       mp_set_long(&b, (unsigned long)labs(em));
       if (em < 0)
          mp_neg(&b, &b);
@@ -518,8 +539,8 @@ static int test_mp_set_double(void)
    }
 
    for (i = 0; i < 1000; ++i) {
-      int tmp = rand();
-      double dbl = (double)tmp * rand() + 1;
+      int tmp = rand_int();
+      double dbl = (double)tmp * rand_int() + 1;
       if (mp_set_double(&a, dbl) != MP_OKAY) {
          printf("\nmp_set_double() failed");
          goto LBL_ERR;
@@ -558,7 +579,7 @@ static int test_mp_get_int(void)
    }
 
    for (i = 0; i < 1000; ++i) {
-      t = ((unsigned long)rand() * (unsigned long)rand() + 1uL) & 0xFFFFFFFFuL;
+      t = (unsigned long)rand_long() & 0xFFFFFFFFuL;
       mp_set_int(&a, t);
       if (t != mp_get_int(&a)) {
          printf("\nmp_get_int() bad result!");
@@ -662,7 +683,7 @@ static int test_mp_sqrt(void)
    for (i = 0; i < 1000; ++i) {
       printf("%6d\r", i);
       fflush(stdout);
-      n = (rand() & 15) + 1;
+      n = (rand_int() & 15) + 1;
       mp_rand(&a, n);
       if (mp_sqrt(&a, &b) != MP_OKAY) {
          printf("\nmp_sqrt() error!");
@@ -701,7 +722,7 @@ static int test_mp_is_square(void)
       fflush(stdout);
 
       /* test mp_is_square false negatives */
-      n = (rand() & 7) + 1;
+      n = (rand_int() & 7) + 1;
       mp_rand(&a, n);
       mp_sqr(&a, &a);
       if (mp_is_square(&a, &n) != MP_OKAY) {
@@ -789,7 +810,7 @@ static int test_mp_prime_rand(void)
    for (ix = 10; ix < 128; ix++) {
       printf("Testing (not safe-prime): %9d bits    \r", ix);
       fflush(stdout);
-      err = mp_prime_rand(&a, 8, ix, (rand() & 1) ? 0 : MP_PRIME_2MSB_ON);
+      err = mp_prime_rand(&a, 8, ix, (rand_int() & 1) ? 0 : MP_PRIME_2MSB_ON);
       if (err != MP_OKAY) {
          printf("\nfailed with error: %s\n", mp_error_to_string(err));
          goto LBL_ERR;
@@ -850,7 +871,7 @@ static int test_mp_prime_is_prime(void)
    for (ix = 16; ix < 128; ix++) {
       printf("Testing (    safe-prime): %9d bits    \r", ix);
       fflush(stdout);
-      err = mp_prime_rand(&a, 8, ix, ((rand() & 1) ? 0 : MP_PRIME_2MSB_ON) | MP_PRIME_SAFE);
+      err = mp_prime_rand(&a, 8, ix, ((rand_int() & 1) ? 0 : MP_PRIME_2MSB_ON) | MP_PRIME_SAFE);
       if (err != MP_OKAY) {
          printf("\nfailed with error: %s\n", mp_error_to_string(err));
          goto LBL_ERR;
@@ -941,7 +962,7 @@ static int test_mp_montgomery_reduce(void)
 
          /* now test a random reduction */
          for (ix = 0; ix < 100; ix++) {
-            mp_rand(&c, 1 + abs(rand()) % (2*i));
+            mp_rand(&c, 1 + abs(rand_int()) % (2*i));
             mp_copy(&c, &d);
             mp_copy(&c, &e);
 
@@ -1096,7 +1117,7 @@ static int test_mp_div_3(void)
          printf("%9d\r", cnt);
          fflush(stdout);
       }
-      mp_rand(&a, abs(rand()) % 128 + 1);
+      mp_rand(&a, abs(rand_int()) % 128 + 1);
       mp_div(&a, &d, &b, &e);
       mp_div_3(&a, &c, &r2);
 
@@ -1853,6 +1874,9 @@ int unit_tests(int argc, char **argv)
    unsigned long i;
    int res = EXIT_SUCCESS, j;
 
+   s_mp_rand_jenkins_init((uint64_t)time(NULL));
+   mp_rand_source(s_mp_rand_jenkins);
+
    for (i = 0; i < sizeof(test) / sizeof(test[0]); ++i) {
       if (argc > 1) {
          for (j = 1; j < argc; ++j) {