blowfish-mktab.c: Remove the eye-candy progress meter.

[u/mdw/catacomb] / gf-arith.c

diff --git a/gf-arith.c b/gf-arith.c
index 209c3fc..5a7b3f2 100644 (file)
--- a/gf-arith.c
+++ b/gf-arith.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: gf-arith.c,v 1.3 2004/03/27 17:54:11 mdw Exp $
+ * $Id$
  *
  * Basic arithmetic on binary polynomials
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,32 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: gf-arith.c,v $
- * Revision 1.3  2004/03/27 17:54:11  mdw
- * Standard curves and curve checking.
- *
- * Revision 1.2  2004/03/21 22:52:06  mdw
- * Merge and close elliptic curve branch.
- *
- * Revision 1.1.2.1  2004/03/21 22:39:46  mdw
- * Elliptic curves on binary fields work.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "gf.h"
@@ -193,11 +179,17 @@ void gf_div(mp **qq, mp **rr, mp *a, mp *b)
 
 int gf_irreduciblep(mp *f)
 {
-  unsigned long m = mp_bits(f) - 1;
+  unsigned long m;
   mp *u = MP_TWO;
   mp *v = MP_NEW;
 
-  m /= 2;
+  if (MP_ZEROP(f))
+    return (0);
+  else if (MP_LEN(f) == 1) {
+    if (f->v[0] < 2) return (0);
+    if (f->v[0] < 4) return (1);
+  }
+  m = (mp_bits(f) - 1)/2;
   while (m) {
     u = gf_sqr(u, u);
     gf_div(0, &u, u, f);
@@ -219,8 +211,8 @@ static int verify(const char *op, mp *expect, mp *result, mp *a, mp *b)
 {
   if (!MP_EQ(expect, result)) {
     fprintf(stderr, "\n*** %s failed", op);
-    fputs("\n*** a      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\n*** b      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\n*** a     = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\n*** b     = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\n*** result = ", stderr); mp_writefile(result, stderr, 16);
     fputs("\n*** expect = ", stderr); mp_writefile(expect, stderr, 16);
     fputc('\n', stderr);
@@ -244,6 +236,7 @@ static int verify(const char *op, mp *expect, mp *result, mp *a, mp *b)
 
 RIG(add, gf_add)
 RIG(mul, gf_mul)
+RIG(exp, gf_exp)
 
 #undef RIG
 
@@ -285,9 +278,9 @@ static int tirred(dstr *v)
   if (r != c) {
     ok = 0;
     fprintf(stderr, "\n*** irred failed");
-    fputs("\n*** a      = ", stderr); mp_writefile(a, stderr, 16);
-    fprintf(stderr, "\n*** r      = %d\n", r);
-    fprintf(stderr, "*** c      = %d\n", c);
+    fputs("\n*** a     = ", stderr); mp_writefile(a, stderr, 16);
+    fprintf(stderr, "\n*** r     = %d\n", r);
+    fprintf(stderr, "*** c     = %d\n", c);
   }
   mp_drop(a);
   assert(mparena_count(MPARENA_GLOBAL) == 0);
@@ -299,6 +292,7 @@ static test_chunk tests[] = {
   { "mul", tmul, { &type_mp, &type_mp, &type_mp, 0 } },
   { "sqr", tsqr, { &type_mp, &type_mp, 0 } },
   { "div", tdiv, { &type_mp, &type_mp, &type_mp, &type_mp, 0 } },
+  { "exp", texp, { &type_mp, &type_mp, &type_mp, 0 } },
   { "irred", tirred, { &type_mp, &type_int, 0 } },
   { 0, 0, { 0 } },
 };