Release 2.1.4.

[u/mdw/catacomb] / ec-test.c

diff --git a/ec-test.c b/ec-test.c
index e83e3ee..ad2af90 100644 (file)
--- a/ec-test.c
+++ b/ec-test.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ec-test.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Code for testing elliptic-curve stuff
  *
  * (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,
@@ -103,6 +103,7 @@ static int ecSAMEP(ec_curve *cc, ec_curve *dd)
 }
 
 static const ec_ops ecops = {
+  "cardboard",
   ecDESTROY, ecSAMEP, ecIN, ecOUT, ecFIX,
   ecFIND, ecNEG, ecADD, ecSUB, ecDBL, ecCHECK
 };
@@ -176,7 +177,7 @@ static void ecdodump(ec *a, FILE *fp)
   if (EC_ATINF(a))
     fputs("inf", fp);
   else {
-    fputs("0x", fp); 
+    fputs("0x", fp);
     mp_writefile(a->x, fp, 16);
     fputs(", 0x", fp);
     mp_writefile(a->y, fp, 16);
@@ -189,7 +190,7 @@ static void ecdump(dstr *d, FILE *fp)
   ecdodump(a, fp);
 }
 
-test_type type_ec = { eccvt, ecdump };
+const test_type type_ec = { eccvt, ecdump };
 
 /*----- Testing elliptic curve functionality ------------------------------*/
 
@@ -266,9 +267,9 @@ static int vcheck(dstr v[])
   if (r != c) {
     fprintf(stderr, "check failed");
     fprintf(stderr, "\ncurve = "); type_ecurve.dump(v, stderr);
-    fprintf(stderr, "\n    a = "); ecdodump(a, stderr);
-    fprintf(stderr, "\n    r = %d", r);
-    fprintf(stderr, "\n    c = %d", c); 
+    fprintf(stderr, "\n           a = "); ecdodump(a, stderr);
+    fprintf(stderr, "\n           r = %d", r);
+    fprintf(stderr, "\n           c = %d", c);
     fprintf(stderr, "\n");
     ok = 0;
   }
@@ -289,10 +290,10 @@ static int vmul(dstr v[])
   if (!EC_EQ(r, &c)) {
     fprintf(stderr, "mul failed");
     fprintf(stderr, "\ncurve = "); type_ecurve.dump(v, stderr);
-    fprintf(stderr, "\n    a = "); ecdodump(a, stderr);
-    fprintf(stderr, "\n    n = "); mp_writefile(n, stderr, 10);
-    fprintf(stderr, "\n    r = "); ecdodump(r, stderr);
-    fprintf(stderr, "\n    c = "); ecdodump(&c, stderr);
+    fprintf(stderr, "\n           a = "); ecdodump(a, stderr);
+    fprintf(stderr, "\n           n = "); mp_writefile(n, stderr, 10);
+    fprintf(stderr, "\n           r = "); ecdodump(r, stderr);
+    fprintf(stderr, "\n           c = "); ecdodump(&c, stderr);
     fprintf(stderr, "\n");
     ok = 0;
   }
@@ -312,9 +313,9 @@ static int vfind(dstr v[])
   if (!EC_EQ(r, &c)) {
     fprintf(stderr, "find failed");
     fprintf(stderr, "\ncurve = "); type_ecurve.dump(v, stderr);
-    fprintf(stderr, "\n    x = "); mp_writefile(x, stderr, 16);
-    fprintf(stderr, "\n    r = "); ecdodump(r, stderr);
-    fprintf(stderr, "\n    c = "); ecdodump(&c, stderr);
+    fprintf(stderr, "\n           x = "); mp_writefile(x, stderr, 16);
+    fprintf(stderr, "\n           r = "); ecdodump(r, stderr);
+    fprintf(stderr, "\n           c = "); ecdodump(&c, stderr);
     fprintf(stderr, "\n");
     ok = 0;
   }