added libtompoly-0.03

Tom St Denis · sjaeckel · commit 03749f685d0a · 2010-10-19T20:11:07.000+02:00
diff --git a/TODO b/TODO
diff --git a/WARNING b/WARNING
diff --git a/changes.txt b/changes.txt
@@ -1,3 +1,7 @@
+Jan 25th, 2004
+v0.03 - Added pb_rawsize(), pb_readraw(), pb_toraw()
+      - Fixed bug in pb_monic() where it would only check the first [not leading] coefficient for one
+
 Jan 3rd, 2004
 v0.02 - Update pb_div() to shift r(x) after multplying it wit b(x) to save a bit of time
       - improved pb_gcd() to handle inputs which are zero
diff --git a/makefile b/makefile
@@ -1,7 +1,7 @@
 #Makefile for GCC by Tom St Denis
 CFLAGS += -I. -Os -Wall -W 
 
-VERSION=0.02
+VERSION=0.03
 
 #default files to install
 LIBNAME=libtompoly.a
@@ -20,7 +20,8 @@ default: libtompoly.a
 OBJECTS = pb_init.o pb_clear.o pb_init_size.o pb_grow.o pb_copy.o pb_clamp.o pb_init_copy.o \
 pb_add.o pb_sub.o pb_mul.o pb_div.o pb_zero.o pb_lshd.o pb_rshd.o pb_exch.o pb_mod.o \
 pb_addmod.o pb_submod.o pb_mulmod.o pb_gcd.o pb_init_multi.o pb_clear_multi.o pb_invmod.o \
-pb_cmp.o pb_shrink.o pb_exteuclid.o pb_monic.o pb_exptmod.o pb_isirreduc.o 
+pb_cmp.o pb_shrink.o pb_exteuclid.o pb_monic.o pb_exptmod.o pb_isirreduc.o pb_rawsize.o \
+pb_toraw.o pb_readraw.o
 
 libtompoly.a: $(OBJECTS)
 	ar $(ARFLAGS) libtompoly.a $(OBJECTS)
diff --git a/makefile.msvc b/makefile.msvc
@@ -6,7 +6,8 @@ default: tompoly.lib
 OBJECTS = pb_init.obj pb_clear.obj pb_init_size.obj pb_grow.obj pb_copy.obj pb_clamp.obj pb_init_copy.obj \
 pb_add.obj pb_sub.obj pb_mul.obj pb_div.obj pb_zero.obj pb_lshd.obj pb_rshd.obj pb_exch.obj pb_mod.obj \
 pb_addmod.obj pb_submod.obj pb_mulmod.obj pb_gcd.obj pb_init_multi.obj pb_clear_multi.obj pb_invmod.obj \
-pb_cmp.obj pb_shrink.obj pb_exteuclid.obj pb_monic.obj pb_exptmod.obj pb_isirreduc.obj
+pb_cmp.obj pb_shrink.obj pb_exteuclid.obj pb_monic.obj pb_exptmod.obj pb_isirreduc.obj pb_rawsize.obj \
+pb_toraw.obj pb_readraw.obj
 
 tompoly.lib: $(OBJECTS)
 	lib /out:tompoly.lib $(OBJECTS)
diff --git a/pb.pdf b/pb.pdf
diff --git a/pb.tex b/pb.tex
@@ -49,7 +49,7 @@
 \begin{document}
 \frontmatter
 \pagestyle{empty}
-\title{LibTomPoly User Manual \\ v0.02}
+\title{LibTomPoly User Manual \\ v0.03}
 \author{Tom St Denis \\ tomstdenis@iahu.ca}
 \maketitle
 This text and library are  hereby placed in the public domain.  This book has been 
diff --git a/pb_gcd.c b/pb_gcd.c
@@ -15,7 +15,6 @@
 int pb_gcd(pb_poly *a, pb_poly *b, pb_poly *c)
 {
    pb_poly A, B, tmp;
-   mp_int  inv;
    int err;
 
    if (mp_iszero(&(c->characteristic)) == MP_YES) {
@@ -29,7 +28,6 @@ int pb_gcd(pb_poly *a, pb_poly *b, pb_poly *c)
       c->used = 1;
       mp_set(&(c->terms[0]), 1);
       return MP_OKAY;
-
    } else if (a->used == 0) {
       return pb_copy(b, c);
    } else if (b->used == 0) {
@@ -45,27 +43,23 @@ int pb_gcd(pb_poly *a, pb_poly *b, pb_poly *c)
    if ((err = pb_init_copy(&B, b)) != MP_OKAY) {
       goto __A;
    }
-   if ((err = mp_init(&inv)) != MP_OKAY) {
-      goto __B;
-   }
 
    while (B.used > 0) {
        if ((err = pb_mod(&A, &B, &tmp)) != MP_OKAY) {
-          goto __INV;
+          goto __B;
        }
        /* A = B, B = tmp */
        if ((err = pb_copy(&B, &A)) != MP_OKAY) {
-          goto __INV;
+          goto __B;
        }
        if ((err = pb_copy(&tmp, &B)) != MP_OKAY) {
-          goto __INV;
+          goto __B;
        }
    }
 
    /* ensure it's monic */
    err = pb_monic(&A, c);
 
-__INV: mp_clear(&inv);
 __B  : pb_clear(&B);
 __A  : pb_clear(&A);
 __TMP: pb_clear(&tmp);
diff --git a/pb_isirreduc.c b/pb_isirreduc.c
@@ -42,8 +42,8 @@ int pb_isirreduc(pb_poly *a, int *res)
        mp_set(&(tmp.terms[1]), 1); tmp.used = 2;
        if ((err = pb_sub(&u, &tmp, &tmp)) != MP_OKAY)                         { goto _ERR; }
 
-       /* d = gcd(u, tmp) */
-       if ((err = pb_gcd(&fm, &tmp, &d)) != MP_OKAY)                           { goto _ERR; }
+       /* d = gcd(fm, tmp) */
+       if ((err = pb_gcd(&fm, &tmp, &d)) != MP_OKAY)                          { goto _ERR; }
        
        /* if d != 1 then reducible */
        if (d.used > 1)                                                        { err = MP_OKAY; goto _ERR; }
diff --git a/pb_monic.c b/pb_monic.c
@@ -23,7 +23,7 @@ int pb_monic(pb_poly *a, pb_poly *b)
    }
 
    /* if it's already one just copy */
-   if (mp_cmp_d(&(a->terms[0]), 1) == MP_EQ) {
+   if (mp_cmp_d(&(a->terms[a->used - 1]), 1) == MP_EQ) {
       return pb_copy(a, b);
    }
 
diff --git a/pb_rawsize.c b/pb_rawsize.c
@@ -0,0 +1,32 @@
+/* LibTomPoly, Polynomial Basis Math -- Tom St Denis 
+ * 
+ * LibTomPoly is a public domain library that provides
+ * polynomial basis arithmetic support.  It relies on
+ * LibTomMath for large integer support.
+ *
+ * This library is free for all purposes without any
+ * express guarantee that it works.
+ *
+ * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
+ */
+#include <tompoly.h>
+
+int pb_rawsize(pb_poly *a)
+{
+   int x, y;
+
+   /* 2 bytes for # of coefficients */
+   y = 2;
+   
+   /* characteristic */
+   y += 2 + mp_signed_bin_size(&(a->characteristic));
+
+   /* all of the terms */
+   for (x = 0; x < a->used; x++) {
+       y += 2 + mp_signed_bin_size(&(a->terms[x]));
+   }
+   
+   return y;
+}
+
+
diff --git a/pb_readraw.c b/pb_readraw.c
@@ -0,0 +1,55 @@
+/* LibTomPoly, Polynomial Basis Math -- Tom St Denis 
+ * 
+ * LibTomPoly is a public domain library that provides
+ * polynomial basis arithmetic support.  It relies on
+ * LibTomMath for large integer support.
+ *
+ * This library is free for all purposes without any
+ * express guarantee that it works.
+ *
+ * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
+ */
+#include <tompoly.h>
+
+int pb_readraw(pb_poly *a, unsigned char *buf, int len)
+{
+   int terms, x, y, z, err;
+
+   /* zero poly */
+   pb_zero(a);
+
+   /* must be at least four bytes */
+   if (len < 4) {
+      return MP_VAL;
+   }
+ 
+   /* number of terms */
+   terms = ((unsigned)buf[0]) | ((unsigned)buf[1]<<8);
+   y     = 2;
+
+   /* grow to the right size */
+   if (a->alloc < terms) {
+      if ((err = pb_grow(a, terms)) != MP_OKAY) {
+         return err;
+      }
+   }
+
+   /* read characteristic */
+   z = ((unsigned)buf[y]) | ((unsigned)buf[y+1]<<8); y += 2;
+   if (z + y > len)                                                                   { return MP_VAL; }
+   if ((err = mp_read_signed_bin(&(a->characteristic), buf+y, z)) != MP_OKAY)         { return err; }
+   y += z;
+
+
+   /* read terms */
+   for (x = 0; x < terms; x++) {
+      z = ((unsigned)buf[y]) | ((unsigned)buf[y+1]<<8); y += 2;
+      if (z + y > len)                                                                { return MP_VAL; }
+      if ((err = mp_read_signed_bin(&(a->characteristic), buf+y, z)) != MP_OKAY)      { return err; }
+      y += z;
+   }
+
+   return MP_OKAY;
+}
+
+
diff --git a/pb_toraw.c b/pb_toraw.c
@@ -0,0 +1,42 @@
+/* LibTomPoly, Polynomial Basis Math -- Tom St Denis 
+ * 
+ * LibTomPoly is a public domain library that provides
+ * polynomial basis arithmetic support.  It relies on
+ * LibTomMath for large integer support.
+ *
+ * This library is free for all purposes without any
+ * express guarantee that it works.
+ *
+ * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
+ */
+#include <tompoly.h>
+
+int pb_toraw(pb_poly *a, unsigned char *dst)
+{
+   int err, x, y, z;
+
+   /* store the # of terms */
+   dst[0] = a->used & 255;
+   dst[1] = (a->used >> 8) & 255;
+   y      = 2;
+
+   /* store the characteristic */
+   z = mp_signed_bin_size(&(a->characteristic));
+   dst[y++] = z&255;
+   dst[y++] = (z>>8)&255;
+   if ((err = mp_to_signed_bin(&(a->characteristic), dst+y)) != MP_OKAY)          { return err; }
+   y += z;
+
+   for (x = 0; x < a->used; x++) {
+      z = mp_signed_bin_size(&(a->terms[x]));
+      dst[y++] = z&255;
+      dst[y++] = (z>>8)&255;
+      if ((err = mp_to_signed_bin(&(a->terms[x]), dst+y)) != MP_OKAY)             { return err; }
+      y += z;
+   }
+
+   return MP_OKAY;
+}
+
+
+
diff --git a/tompoly.h b/tompoly.h
@@ -107,4 +107,9 @@ int pb_exptmod (pb_poly * G, mp_int * X, pb_poly * P, pb_poly * Y);
 int pb_isirreduc(pb_poly *a, int *res);
 
 
+/* I/O */
+int pb_rawsize(pb_poly *a);
+int pb_toraw(pb_poly *a, unsigned char *dst);
+int pb_readraw(pb_poly *a, unsigned char *buf, int len);
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ int pb_monic(pb_poly a, pb_poly b)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/* if it's already one just copy */`
`26`		`- if (mp_cmp_d(&(a->terms[0]), 1) == MP_EQ) {`
	`26`	`+ if (mp_cmp_d(&(a->terms[a->used - 1]), 1) == MP_EQ) {`
`27`	`27`	`return pb_copy(a, b);`
`28`	`28`	`}`
`29`	`29`