From 31cb4e2ef91d4ab2a6cc2d5fea5ac790be8f3801 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Thu, 22 Jun 2000 19:03:14 +0000
Subject: [PATCH] Use the new @mp_odd@ function.

---
 rabin.c       | 23 +++++------------------
 rsa-recover.c | 18 ++++++------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/rabin.c b/rabin.c
index 58d5291..677e233 100644
--- 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);
 }
diff --git a/rsa-recover.c b/rsa-recover.c
index 14b67bd..18b6c6a 100644
--- a/rsa-recover.c
+++ b/rsa-recover.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rsa-recover.c,v 1.2 2000/06/17 12:07:19 mdw Exp $
+ * $Id: rsa-recover.c,v 1.3 2000/06/22 19:03:14 mdw Exp $
  *
  * Recover RSA parameters
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rsa-recover.c,v $
+ * Revision 1.3  2000/06/22 19:03:14  mdw
+ * Use the new @mp_odd@ function.
+ *
  * Revision 1.2  2000/06/17 12:07:19  mdw
  * Fix a bug in argument validation.  Force %$p > q$% in output.  Use
  * %$\lambda(n) = \lcm(p - 1, q - 1)$% rather than the more traditional
@@ -93,8 +96,7 @@ int rsa_recover(rsa_param *rp)
       return (-1);
     else {
       mp *t;
-      unsigned s;
-      mpscan ms;
+      size_t s;
       mp a; mpw aw;
       mp *m1;
       mpmont mm;
@@ -109,15 +111,7 @@ int rsa_recover(rsa_param *rp)
 
       t = mp_mul(MP_NEW, rp->e, rp->d);
       t = mp_sub(t, t, MP_ONE);
-      s = 0;
-      mp_scan(&ms, t);
-      for (;;) {
-	MP_STEP(&ms);
-	if (MP_BIT(&ms))
-	  break;
-	s++;
-      }
-      t = mp_lsr(t, t, s);
+      t = mp_odd(t, t, &s);
 
       /* --- Set up for the exponentiation --- */
 
-- 
2.11.0