X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/8ef0c733529192159b3af4d5cbb4f347a8275e49..898a4e2555438ff8adb08b4d82690d08715e1048:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 7adc8d8..3f2672d 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.76 2004/04/01 12:59:40 mdw Exp $
+## $Id: Makefile.m4,v 1.79 2004/04/04 19:42:59 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,17 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.79  2004/04/04 19:42:59  mdw
+## Add set -e.
+##
+## Revision 1.78  2004/04/04 19:04:11  mdw
+## Raw I/O of elliptic curve points and group elements.
+##
+## 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.
 ##
@@ -311,7 +322,7 @@ _(serpent) _(noekeon)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
-_(md5) _(md4) _(md2) _(tiger) dnl
+_(md5) _(md4) _(md2) _(tiger) _(has160) dnl
 _(sha) _(sha224) _(sha256) _(sha384) _(sha512) dnl
 _(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
@@ -351,16 +362,32 @@ 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
 
+gciphertab.c: gengctab
+	$(srcdir)/gengctab gccipher gcipher >gciphertab.c.new \
+		"lit(join(`ciphers', `-', `cipher_modes')) \
+		rc4 seal" 
+	mv gciphertab.c.new gciphertab.c
+
+gmactab.c: gengctab
+	$(srcdir)/gengctab gcmac gmac >gmactab.c.new \
+		"lit(join(`hashes', `-', `_(hmac)'))" 
+	mv gmactab.c.new gmactab.c
+
+ghashtab.c: gengctab
+	$(srcdir)/gengctab gchash ghash >ghashtab.c.new \
+		"lit(`hashes')"
+	mv ghashtab.c.new ghashtab.c
+
 BUILT_SOURCES = \
-	getdate.c modes-stamp \
+	getdate.c modes-stamp gciphertab.c gmactab.c ghashtab.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
@@ -382,14 +409,14 @@ 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 \
+	bbs.h rsa.h dh.h dsarand.h dsa.h gdsa.h gkcdsa.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 ectab.h ec-keys.h \
+	field.h ec.h ec-exp.h ec-test.h ectab.h ec-keys.h ec-raw.h \
 	ptab.h group.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
@@ -413,12 +440,12 @@ 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 \
 	ec.c ec-exp.c ec-prime.c ec-bin.c ec-test.c ec-info.c ectab.c \
-	ec-fetch.c g-ec.c')
+	ec-fetch.c ec-raw.c g-ec.c')
 
 define(`PGEN_SOURCES',
 	`pfilt.c rabin.c \
@@ -429,6 +456,7 @@ define(`PGEN_SOURCES',
 	rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
 	dh-gen.c dh-limlee.c dh-check.c dh-fetch.c dh-param.c \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
+	gdsa.c gkcdsa.c \
 	key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
 	key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \
 	key-error.c key-fetch.c \
@@ -442,6 +470,7 @@ libcatacomb_la_SOURCES = \
 	oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
+	gciphertab.c ghashtab.c gmactab.c \
 	des-base.c des-base.h \
 	desx-tab.h \
 	rc2-tab.h \
@@ -535,15 +564,17 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 ## --- Other handy definitions ---
 
 EXTRA_DIST = \
-	Makefile.m4 genmodes $(man_MANS) xpixie group-test.c \
-	ectab.in ec-gentab.sh ptab.in p-gentab.sh \
+	Makefile.m4 genmodes gengctab $(man_MANS) xpixie group-test.c \
+	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 \
 	debian/catacomb-bin.prerm debian/catacomb-bin.templates
 
 dist-hook:
-	@ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
+	@for i in getdate.c gciphertab.c ghashtab.c gmactab.c; do \
+	  ln $$i $(distdir) || ln $(srcdir)/$$i $(distdir) || true; \
+	done
 	@echo datestamp >$(distdir)/modes-stamp || true
 	@for i in calc tests; do \
 	  mkdir $(distdir)/$$i; \
@@ -603,12 +634,15 @@ CTESTRIG(gfx-kmul)
 CTESTRIG(gf-arith)
 CTESTRIG(gf-gcd)
 CTESTRIG(gfreduce)
+CTESTRIG(gfn)
 CTESTRIG(ec-prime)
 CTESTRIG(ec-bin)
 CTESTRIG(ec-test)
 CTESTRIG(ec-info)
 CTESTRIG(dh-param)
 CTESTRIG(group-test)
+CTESTRIG(gdsa)
+CTESTRIG(gkcdsa)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)