X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/34e4f738bcba58e6d8c4cabbb0b3232a65b42a9d..8404fd750e8d1a635ccb3895e4f0e155e5f5e3cf:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 12c4dd0..e15b5eb 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.75 2004/04/01 12:50:09 mdw Exp $
+## $Id: Makefile.m4,v 1.77 2004/04/01 21:28:41 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,14 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.77  2004/04/01 21:28:41  mdw
+## Normal basis support (translates to poly basis internally).  Rewrite
+## EC and prime group table generators in awk, so that they can reuse data
+## for repeated constants.
+##
+## Revision 1.76  2004/04/01 12:59:40  mdw
+## Ooops!  qdparse needs mp headers.
+##
 ## Revision 1.75  2004/04/01 12:50:09  mdw
 ## Add cyclic group abstraction, with test code.  Separate off exponentation
 ## functions for better static linking.  Fix a buttload of bugs on the way.
@@ -348,12 +356,12 @@ 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
+ectab.c: ectab.in ec-gentab.awk mpdump
+	$(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
 	mv ectab.c.new ectab.c
 
-ptab.c: ptab.in p-gentab.sh mpdump
-	$(srcdir)/p-gentab.sh <$(srcdir)/ptab.in >ptab.c.new
+ptab.c: ptab.in p-gentab.awk mpdump
+	$(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
 	mv ptab.c.new ptab.c
 
 BUILT_SOURCES = \
@@ -379,7 +387,7 @@ pkginclude_HEADERS = \
 	mpx.h bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
 	exp.h mpbarrett.h mpmont.h mpreduce.h \
 	mpcrt.h mprand.h mpmul.h \
-	gfx.h gf.h gfreduce.h \
+	gfx.h gf.h gfreduce.h gfn.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 \
@@ -394,7 +402,7 @@ pkginclude_HEADERS = \
 	addsuffix(`hash_modes', `-def.h') crc32.h
 
 define(`MP_SOURCES',
-	`mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
+	`mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c qdparse.c \
 	mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
 	mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c \
 	mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
@@ -410,7 +418,7 @@ define(`MP_SOURCES',
 
 define(`GF_SOURCES',
 	`gfx.c gfx-kmul.c gfx-sqr.c gf-arith.c gf-gcd.c \
-	gfreduce.c gfreduce-exp.h')
+	gfreduce.c gfreduce-exp.h gfn.c')
 
 define(`EC_SOURCES',
 	`field.c field-parse.c f-prime.c f-niceprime.c f-binpoly.c \
@@ -434,7 +442,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 qdparse.c \
+	arena.c \
 	passphrase.c pixie-client.c pixie-common.c lmem.c \
 	oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
 	gfshare.c \
@@ -533,7 +541,7 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 
 EXTRA_DIST = \
 	Makefile.m4 genmodes $(man_MANS) xpixie group-test.c \
-	ectab.in ec-gentab.sh ptab.in p-gentab.sh \
+	ectab.in ec-gentab.awk ptab.in p-gentab.awk \
 	README.cipher README.hash README.random README.mp \
 	debian/rules debian/copyright debian/control debian/changelog \
 	debian/catacomb-bin.postinst debian/catacomb-bin.config \
@@ -600,6 +608,7 @@ CTESTRIG(gfx-kmul)
 CTESTRIG(gf-arith)
 CTESTRIG(gf-gcd)
 CTESTRIG(gfreduce)
+CTESTRIG(gfn)
 CTESTRIG(ec-prime)
 CTESTRIG(ec-bin)
 CTESTRIG(ec-test)