X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/432c4e184d44704511a5991b80224a87cb1d4613..1d6d3b01cb40e0cfaeb816c87c513695aea0816a:/ectab.h

diff --git a/ectab.h b/ectab.h
index d8d4302..7e6161c 100644
--- a/ectab.h
+++ b/ectab.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ectab.h,v 1.1 2004/03/27 17:54:11 mdw Exp $
+ * $Id: ectab.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
- * Table of standard elliptic curves (internal)
+ * Table of standard elliptic curves
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +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: ectab.h,v $
- * Revision 1.1  2004/03/27 17:54:11  mdw
- * Standard curves and curve checking.
- *
- */
-
 #ifndef CATACOMB_ECTAB_H
 #define CATACOMB_ECTAB_H
 
@@ -43,31 +35,30 @@
 #endif
 
 /*----- Header files ------------------------------------------------------*/
-    
+
 #include "ec.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct ecdata {
   unsigned ftag;			/* The kind of curve this is */
-  const mpw *p; size_t psz;		/* Modulus */
-  const mpw *a; size_t asz;		/* Elliptic curve parameters */
-  const mpw *b; size_t bsz;
-  const mpw *r; size_t rsz;		/* Order of common point %$g$% */
-  const mpw *h; size_t hsz;		/* Cofactor %$h = \#E/r$% */
-  const mpw *gx; size_t gxsz;		/* Common point */
-  const mpw *gy; size_t gysz;
+  mp p, beta;				/* Modulus, and conversion magic */
+  mp a, b;				/* Elliptic curve parameters */
+  mp r;					/* Order of common point %$g$% */
+  mp h;					/* Cofactor %$h = \#E/r$% */
+  mp gx, gy;				/* Common point */
 } ecdata;
 
 enum {
   FTAG_PRIME,				/* Prime but not nice */
   FTAG_NICEPRIME,			/* Nice prime field */
-  FTAG_BINPOLY				/* Any old binary field */
+  FTAG_BINPOLY,				/* Binary field, poly basis */
+  FTAG_BINNORM				/* Binary field, normal basis */
 };
 
 typedef struct ecentry {
   const char *name;
-  const ecdata *data;
+  ecdata *data;
 } ecentry;
 
 /*----- Global variables --------------------------------------------------*/