X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b085fd9162fa3ff5b16788ced6d11a71ffe5a5fe..d4bb7fded5f9a4b0db99f82e88f22effe94f2ff7:/ec-exp.h

diff --git a/ec-exp.h b/ec-exp.h
index c760c43..8ee3154 100644
--- a/ec-exp.h
+++ b/ec-exp.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ec-exp.h,v 1.1 2002/01/13 13:48:44 mdw Exp $
+ * $Id: ec-exp.h,v 1.6 2004/04/08 01:36:15 mdw Exp $
  *
  * Exponentiation operations for elliptic curves
  *
  * (c) 2001 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: ec-exp.h,v $
- * Revision 1.1  2002/01/13 13:48:44  mdw
- * Further progress.
- *
- */
-
 #ifndef CATACOMB_EC_EXP_H
 #define CATACOMB_EC_EXP_H
 
@@ -46,23 +38,24 @@
 
 #define EXP_TYPE ec
 
-#define EXP_COPY(d, x) do {						\
-  d.x = MP_COPY(x.x);							\
-  d.y = MP_COPY(x.y);							\
-  d.z = x.z ? MP_COPY(x.x) : MP_NEW;					\
-} while (0)  
-#define EXP_DROP(x) EC_DESTROY(c, &x)
+#define EXP_COPY(d, p) do {						\
+  (d).x = MP_COPY((p).x);						\
+  (d).y = MP_COPY((p).y);						\
+  (d).z = (p).z ? MP_COPY((p).z) : MP_NEW;				\
+} while (0)
+#define EXP_DROP(x) EC_DESTROY(&(x))
 
-#define EXP_MUL(a, x) EC_ADD(c, &a, &a, &x)
-#define EXP_SQR(a) EC_DBL(c, &a, &a);
+#define EXP_MUL(a, x) EC_ADD(c, &(a), &(a), &(x))
+#define EXP_SQR(a) EC_DBL(c, &(a), &(a))
+#define EXP_FIX(x)
 
 #define EXP_SETMUL(d, x, y) do {					\
-  EC_CREATE(&d);							\
-  EC_ADD(c, &d, &x, &y);						\
+  EC_CREATE(&(d));							\
+  EC_ADD(c, &(d), &(x), &(y));						\
 } while (0)
 #define EXP_SETSQR(d, x) do {						\
-  EC_CREATE(&d);							\
-  EC_DBL(c, &d, &x);							\
+  EC_CREATE(&(d));							\
+  EC_DBL(c, &(d), &(x));						\
 } while (0)
 
 #include "exp.h"