X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..cc3ca08f22460b15423bb88632f3a12741b19003:/mpmont-exp.c

diff --git a/mpmont-exp.c b/mpmont-exp.c
index c43d02f..6959baf 100644
--- a/mpmont-exp.c
+++ b/mpmont-exp.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mpmont-exp.c,v 1.2 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Modular exponentiation with Montgomery reduction
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -52,17 +52,19 @@ mp *mpmont_expr(mpmont *mm, mp *d, mp *a, mp *e)
 
   MP_COPY(a);
   MP_SHRINK(e);
-  if (e->f & MP_NEG) {
-    a = mpmont_reduce(mm, a, a);
-    a = mp_modinv(a, a, mm->m);
-    a = mpmont_mul(mm, a, a, mm->r2);
-  }
-  if (MP_LEN(e) == 0)
+  if (MP_ZEROP(e))
     ;
-  else if (MP_LEN(e) < EXP_THRESH)
-    EXP_SIMPLE(x, a, e);
-  else
-    EXP_WINDOW(x, a, e);
+  else {
+    if (MP_NEGP(e)) {
+      a = mpmont_reduce(mm, a, a);
+      a = mp_modinv(a, a, mm->m);
+      a = mpmont_mul(mm, a, a, mm->r2);
+    }
+    if (MP_LEN(e) < EXP_THRESH)
+      EXP_SIMPLE(x, a, e);
+    else
+      EXP_WINDOW(x, a, e);
+  }
   mp_drop(d);
   mp_drop(spare);
   mp_drop(a);
@@ -128,7 +130,6 @@ static int texp(dstr *v)
   return ok;
 }
 
-
 static test_chunk tests[] = {
   { "exp", texp, { &type_mp, &type_mp, &type_mp, &type_mp, 0 } },
   { 0, 0, { 0 } },