X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/5bda60bd9209028aa3db06bccd7c708a1d3a9c5e..2685767a6125c1620719c7de6234aedf41857b7e:/mpcrt.c

diff --git a/mpcrt.c b/mpcrt.c
index 51d9b68..17bc6ad 100644
--- a/mpcrt.c
+++ b/mpcrt.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpcrt.c,v 1.2 1999/12/10 23:22:32 mdw Exp $
+ * $Id: mpcrt.c,v 1.5 2001/04/29 17:39:33 mdw Exp $
  *
  * Chinese Remainder Theorem computations (Gauss's algorithm)
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mpcrt.c,v $
+ * Revision 1.5  2001/04/29 17:39:33  mdw
+ * Fix memory leak.
+ *
+ * Revision 1.4  2001/04/19 18:25:38  mdw
+ * Use mpmul for the multiplication.
+ *
+ * Revision 1.3  2000/10/08 12:11:22  mdw
+ * Use @MP_EQ@ instead of @MP_CMP@.
+ *
  * Revision 1.2  1999/12/10 23:22:32  mdw
  * Interface changes for suggested destinations.  Use Barrett reduction.
  *
@@ -42,6 +51,7 @@
 
 #include "mp.h"
 #include "mpcrt.h"
+#include "mpmul.h"
 #include "mpbarrett.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -79,9 +89,11 @@ void mpcrt_create(mpcrt *c, mpcrt_mod *v, size_t k, mp *n)
   if (n != MP_NEW)
     n = MP_COPY(n);
   else {
-    n = MP_COPY(v[0].m);
-    for (i = 1; i < k; i++)
-      n = mp_mul(n, n, v[i].m);
+    mpmul mm;
+    mpmul_init(&mm);
+    for (i = 0; i < k; i++)
+      mpmul_add(&mm, v[i].m);
+    n = mpmul_done(&mm);
   }
 
   /* --- A quick hack if %$k = 2$% --- */
@@ -223,7 +235,7 @@ static int verify(size_t n, dstr *v)
   mpcrt_create(&c, m, n, 0);
   b = mpcrt_solve(&c, MP_NEW, r);
 
-  if (MP_CMP(a, !=, b)) {
+  if (!MP_EQ(a, b)) {
     fputs("\n*** failed\n", stderr);
     fputs("n = ", stderr);
     mp_writefile(c.mb.m, stderr, 10);