catcrypt: Implement symmetric key-encapsulation and signature schemes.

[u/mdw/catacomb] / mpint.h

diff --git a/mpint.h b/mpint.h
index f75d5aa..23378cd 100644 (file)
--- a/mpint.h
+++ b/mpint.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpint.h,v 1.2 1999/12/10 23:22:53 mdw Exp $
+ * $Id$
  *
  * Conversion between MPs and standard C integers
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mpint.h,v $
- * Revision 1.2  1999/12/10 23:22:53  mdw
- * Support for uint32.
- *
- * Revision 1.1  1999/11/25 11:38:31  mdw
- * Support for conversions between MPs and C integers.
- *
- */
-
 #ifndef CATACOMB_MPINT_H
 #define CATACOMB_MPINT_H
 
@@ -71,7 +60,7 @@
   mp *_d = (d);                                                                \
   size_t _sz = 4;                                                      \
                                                                        \
-  MP_MODIFY(_d, _sz);                                                  \
+  MP_DEST(_d, _sz, 0);                                                 \
   _d->f &= ~(MP_NEG | MP_UNDEF);                                       \
                                                                        \
   /* --- Set the sign on the MP --- *                                  \
@@ -105,7 +94,7 @@
      * up all of my negative arithmetic.  So do an explicit test here. \
      */                                                                        \
                                                                        \
-    if (_i > -MPW_MAX)                                                 \
+    if (_i >= -MPW_MAX)                                                        \
       break;                                                           \
     else                                                               \
       _i /= (type)MPW_MAX + 1;                                         \
@@ -147,7 +136,7 @@
     _v++;                                                              \
     _max /= (mpd)MPW_MAX + 1;                                          \
   }                                                                    \
-  if (!(_m->f & MP_NEG))                                               \
+  if (!MP_NEGP(_m))                                                    \
     _i = -_i;                                                          \
   (i) = _i;                                                            \
 } while (0)
@@ -191,7 +180,7 @@ mp_fromINT(ulong, unsigned long);
  */
 
 #define mp_toINT(name, type)                                           \
-  extern type mp_to##name(const mp */*m*/);
+  extern type mp_to##name(const mp */*m*/)
 
 mp_toINT(short, short);
 mp_toINT(ushort, unsigned short);