X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f3099c167f8499b108e01783d589a6c408a7ea91..f41f820e4b3e230d9314cc4323abf59babdd4e67:/rsa-recover.c

diff --git a/rsa-recover.c b/rsa-recover.c
index 14b67bd..304cbca 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.4 2000/07/01 11:22:22 mdw Exp $
  *
  * Recover RSA parameters
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rsa-recover.c,v $
+ * Revision 1.4  2000/07/01 11:22:22  mdw
+ * Remove bad type name `rsa_param'.
+ *
+ * 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
@@ -50,7 +56,7 @@
 
 /* --- @rsa_recover@ --- *
  *
- * Arguments:	@rsa_param *rp@ = pointer to parameter block
+ * Arguments:	@rsa_priv *rp@ = pointer to parameter block
  *
  * Returns:	Zero if all went well, nonzero if the parameters make no
  *		sense.
@@ -58,7 +64,7 @@
  * Use:		Derives the full set of RSA parameters given a minimal set.
  */
 
-int rsa_recover(rsa_param *rp)
+int rsa_recover(rsa_priv *rp)
 {
   /* --- If there is no modulus, calculate it --- */
 
@@ -93,8 +99,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 +114,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 --- */