General utilities cleanup. Add signature support to catcrypt. Throw in

[u/mdw/catacomb] / ec-exp.h

diff --git a/ec-exp.h b/ec-exp.h
index c760c43..fc08fe4 100644 (file)
--- a/ec-exp.h
+++ b/ec-exp.h
@@ -1,6 +1,6 @@
 /* -*-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
  *
@@ -27,14 +27,6 @@
  * 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;                                   \
+#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(c, &x)
+#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"