Use the new @mp_odd@ function.

[u/mdw/catacomb] / rabin.c

diff --git a/rabin.c b/rabin.c
index 58d5291..677e233 100644 (file)
--- a/rabin.c
+++ b/rabin.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rabin.c,v 1.3 1999/12/22 15:50:29 mdw Exp $
+ * $Id: rabin.c,v 1.4 2000/06/22 19:03:02 mdw Exp $
  *
  * Miller-Rabin primality test
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rabin.c,v $
+ * Revision 1.4  2000/06/22 19:03:02  mdw
+ * Use the new @mp_odd@ function.
+ *
  * Revision 1.3  1999/12/22 15:50:29  mdw
  * Reworking for new prime-search system.  Add function for working out how
  * many iterations to use for a particular number.
@@ -66,24 +69,8 @@
 void rabin_create(rabin *r, mp *m)
 {
   mp *m1 = mp_sub(MP_NEW, m, MP_ONE);
-  mpscan sc;
-  size_t s;
-
-  /* --- Find @r@ and @s@ --- */
-
   mpmont_create(&r->mm, m);
-  mp_scan(&sc, m1);
-  s = 0;
-  while (mp_step(&sc)) {
-    if (mp_bit(&sc))
-      break;
-    s++;
-  }
-  r->s = s;
-  r->r = mp_lsr(MP_NEW, m1, s);
-
-  /* --- Compute %$(m - 1)R \bmod m$% --- */
-
+  r->r = mp_odd(MP_NEW, m1, &r->s);
   r->m1 = mp_sub(MP_NEW, m, r->mm.r);
   mp_drop(m1);
 }