Fixes for interface change to @mpmont_expr@ and @mpmont_mexpr@.

[u/mdw/catacomb] / mp-modsqrt.c

diff --git a/mp-modsqrt.c b/mp-modsqrt.c
index 6c21dc4..df60aba 100644 (file)
--- a/mp-modsqrt.c
+++ b/mp-modsqrt.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mp-modsqrt.c,v 1.3 2001/02/03 12:00:29 mdw Exp $
+ * $Id: mp-modsqrt.c,v 1.4 2001/06/16 12:56:38 mdw Exp $
  *
  * Compute square roots modulo a prime
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mp-modsqrt.c,v $
+ * Revision 1.4  2001/06/16 12:56:38  mdw
+ * Fixes for interface change to @mpmont_expr@ and @mpmont_mexpr@.
+ *
  * Revision 1.3  2001/02/03 12:00:29  mdw
  * Now @mp_drop@ checks its argument is non-NULL before attempting to free
  * it.  Note that the macro version @MP_DROP@ doesn't do this.
@@ -111,10 +114,13 @@ mp *mp_modsqrt(mp *d, mp *a, mp *p)
   /* --- Now to really get going --- */
 
   mpmont_create(&mm, p);
+  b = mpmont_mul(&mm, b, b, mm.r2);
   c = mpmont_expr(&mm, b, b, t);
   t = mp_add(t, t, MP_ONE);
   t = mp_lsr(t, t, 1);
-  r = mpmont_expr(&mm, t, a, t);
+  dd = mpmont_mul(&mm, MP_NEW, a, mm.r2);
+  r = mpmont_expr(&mm, t, dd, t);
+  mp_drop(dd);
   ainv = mpmont_mul(&mm, ainv, ainv, mm.r2);
 
   mone = mp_sub(MP_NEW, p, mm.r);