Standard curves and curve checking.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 814fd34..805696b 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.66 2004/03/21 22:43:50 mdw Exp $
+## $Id: Makefile.m4,v 1.71 2004/03/27 17:54:11 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,27 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.71  2004/03/27 17:54:11  mdw
+## Standard curves and curve checking.
+##
+## Revision 1.70  2004/03/27 00:04:46  mdw
+## Implement efficient reduction for pleasant-looking primes.
+##
+## Revision 1.69  2004/03/23 15:19:32  mdw
+## Test elliptic curves more thoroughly.
+##
+## Revision 1.68  2004/03/21 23:03:30  mdw
+## Distribute headers properly.
+##
+## Revision 1.67  2004/03/21 22:52:06  mdw
+## Merge and close elliptic curve branch.
+##
+##   Revision 1.60.2.2  2004/03/21 22:39:46  mdw
+##   Elliptic curves on binary fields work.
+##
+##   Revision 1.60.2.1  2003/06/10 13:43:53  mdw
+##   Simple (non-projective) curves over prime fields now seem to work.
+##
 ## Revision 1.66  2004/03/21 22:43:50  mdw
 ## New hash variant SHA224.
 ##
@@ -310,6 +331,10 @@ mptypes.h: mptypes
        ./mptypes >mptypes.h.new
        mv mptypes.h.new mptypes.h
 
+ectab.c: ectab.in ec-gentab.sh mpdump
+       $(srcdir)/ec-gentab.sh <$(srcdir)/ectab.in >ectab.c.new
+       mv ectab.c.new ectab.c
+
 BUILT_SOURCES = \
        getdate.c modes-stamp \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
@@ -321,24 +346,26 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 2:1:0
+libcatacomb_la_LDFLAGS = -version-info 3:0:1
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
 pkginclude_HEADERS = \
-       arena.h paranoia.h buf.h \
+       arena.h paranoia.h buf.h qdparse.h \
        blkc.h hash.h gcipher.h ghash.h gmac.h grand.h ghash-def.h \
        lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \
        key.h key-data.h passphrase.h pixie.h lmem.h \
        mpx.h bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
-       exp.h mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
-       gfx.h \
+       exp.h mpbarrett.h mpmont.h mpreduce.h \
+       mpcrt.h mprand.h mpmul.h \
+       gfx.h gf.h gfreduce.h \
        primetab.h pfilt.h rabin.h \
        pgen.h prim.h strongprime.h limlee.h keycheck.h \
        bbs.h rsa.h dh.h dsarand.h dsa.h \
        oaep.h pkcs1.h pss.h tlsprf.h sslprf.h \
        gfshare.h share.h \
        rho.h \
+       field.h ec.h ec-exp.h ec-test.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
        allwithsuffix(`hashes', `hash_modes', `.h') \
        addsuffix(`cipher_modes', `-def.h') \
@@ -353,11 +380,17 @@ define(`MP_SOURCES',
        exp.c mpcrt.c mpmul.c mprand.c \
        mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
        mpmont.c mpmont-mexp.c mpmont-exp.h \
+       mpreduce.c mpreduce-exp.h \
        rho.c buf.c \
-       GF_SOURCES PGEN_SOURCES')
+       GF_SOURCES PGEN_SOURCES EC_SOURCES')
 
 define(`GF_SOURCES',
-       `gfx.c gfx-kmul.c gfx-sqr.c')
+       `gfx.c gfx-kmul.c gfx-sqr.c gf-arith.c gf-gcd.c \
+       gfreduce.c gfreduce-exp.h ')
+
+define(`EC_SOURCES',
+       `field.c field-parse.c f-prime.c f-niceprime.c f-binpoly.c \
+       ec.c ec-prime.c ec-bin.c ec-test.c ec-info.c ectab.c')
 
 define(`PGEN_SOURCES',
        `pfilt.c rabin.c \
@@ -376,7 +409,7 @@ define(`PGEN_SOURCES',
 libcatacomb_la_SOURCES = \
        grand.c keysz.c \
        lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
-       arena.c \
+       arena.c qdparse.c \
        passphrase.c pixie-client.c pixie-common.c lmem.c \
        oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
        gfshare.c \
@@ -412,7 +445,7 @@ patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
 bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
-       genprimes mptypes serpent-check bittest \
+       genprimes mptypes serpent-check bittest mpdump \
        addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la
 
@@ -441,6 +474,13 @@ genprimes_LDADD =
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
+mpdump_SOURCES = \
+       mpdump.c \
+       mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
+       mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
+       mptext.c mptext-string.c
+mpdump_LDADD =
+
 ## --- Install the pixie setuid-root if we can ---
 ##
 ## Bodge around a bug in Automake: it doesn't call `install-exec-hook' from
@@ -523,10 +563,18 @@ CTESTRIG(mpbarrett)
 CTESTRIG(mpbarrett-mexp)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
+CTESTRIG(mpreduce)
 CTESTRIG(mpcrt)
 CTESTRIG(mpmul)
 CTESTRIG(gfx)
+CTESTRIG(gfx-sqr)
 CTESTRIG(gfx-kmul)
+CTESTRIG(gf-arith)
+CTESTRIG(gf-gcd)
+CTESTRIG(gfreduce)
+CTESTRIG(ec-prime)
+CTESTRIG(ec-bin)
+CTESTRIG(ec-test)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)