X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/22bab86c9df047bdd258283c6567821319ba7a6f..298182ad446aaced14dea7ed0e7c968946787288:/rho.c

diff --git a/rho.c b/rho.c
index 2ff20a6..d762460 100644
--- a/rho.c
+++ b/rho.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rho.c,v 1.2 2000/10/08 12:11:22 mdw Exp $
+ * $Id: rho.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Pollard's rho algorithm for discrete logs
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: rho.c,v $
- * Revision 1.2  2000/10/08 12:11:22  mdw
- * Use @MP_EQ@ instead of @MP_CMP@.
- *
- * Revision 1.1  2000/07/09 21:32:30  mdw
- * Pollard's rho algorithm for computing discrete logs.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "fibrand.h"
@@ -212,7 +201,7 @@ static void prime_drop(void *x)
   MP_DROP(*(mp **)x);
 }
 
-static rho_ops prime_ops = {
+static const rho_ops prime_ops = {
   prime_sqr, prime_mul, prime_eq, prime_split, prime_drop
 };
 
@@ -240,14 +229,14 @@ mp *rho_prime(mp *g, mp *a, mp *n, mp *p)
   /* --- The main loop --- */
 
   while ((l = rho(&cc, &x, &y, aa, bb)) == 0) {
-    mpmont_factor f[2];
+    mp_expfactor f[2];
 
     if (!r)
       r = fibrand_create(0);
     aa = mprand_range(MP_NEW, n, r, 0);
     bb = mprand_range(MP_NEW, n, r, 0);
-    f[0].base = g; f[0].exp = aa;
-    f[1].base = a; f[1].exp = bb;
+    f[0].base = cc.g; f[0].exp = aa;
+    f[1].base = cc.a; f[1].exp = bb;
     x = mpmont_mexpr(&mm, MP_NEW, f, 2);
     y = MP_COPY(x);
   }