X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ab0350a65e5ac7f1f96e0e2df18c504dd8a441ce..298182ad446aaced14dea7ed0e7c968946787288:/mpbarrett-mexp.c

diff --git a/mpbarrett-mexp.c b/mpbarrett-mexp.c
index e97c064..0338527 100644
--- a/mpbarrett-mexp.c
+++ b/mpbarrett-mexp.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpbarrett-mexp.c,v 1.1 2001/06/16 12:58:34 mdw Exp $
+ * $Id$
  *
  * Multiple simultaneous exponentiations
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mpbarrett-mexp.c,v $
- * Revision 1.1  2001/06/16 12:58:34  mdw
- * Added simultaneous exponentiation with Barrett reduction.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mp.h"
@@ -49,7 +41,7 @@
  *
  * Arguments:	@mpbarrett *mb@ = pointer to Barrett reduction context
  *		@mp *d@ = fake destination
- *		@mp_expfactor *f@ = pointer to array of factors
+ *		@const mp_expfactor *f@ = pointer to array of factors
  *		@size_t n@ = number of factors supplied
  *
  * Returns:	If the bases are %$g_0, g_1, \ldots, g_{n-1}$% and the
@@ -59,23 +51,31 @@
  *		%$g_0^{e_0} g_1^{e_1} \ldots g_{n-1}^{e_{n-1}} \bmod m$%
  */
 
-mp *mpbarrett_mexp(mpbarrett *mb, mp *d, mp_expfactor *f, size_t n)
+mp *mpbarrett_mexp(mpbarrett *mb, mp *d, const mp_expfactor *f, size_t n)
 {
+  mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   mp *a = MP_ONE;
   mp *spare;
+  mp *g = MP_NEW;
   size_t i;
 
   spare = MP_NEW;
   for (i = 0; i < n; i++) {
-    if (f[i].exp->f & MP_BURN) {
+    if (f[i].exp->f & MP_BURN)
       spare = MP_NEWSEC;
-      break;
-    }
+    if (MP_NEGP(f[i].exp))
+      ff[i].base = mp_modinv(MP_NEW, f[i].base, mb->m);
+    else
+      ff[i].base = MP_COPY(f[i].base);
+    ff[i].exp = f[i].exp;
   }
-
-  EXP_SIMUL(a, f, n);
+  mp_drop(g);
+  EXP_SIMUL(a, ff, n);
   mp_drop(d);
   mp_drop(spare);
+  for (i = 0; i < n; i++)
+    mp_drop(ff[i].base);
+  xfree(ff);
   return (a);
 }