X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0f3faccdf5f2f0cfa40bd9bec495c4930052a51f..e9026a0a6d8fc5cbcfa8d658176bfd2776cb550e:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index bd832ab..3f2672d 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.78 2004/04/04 19:04:11 mdw Exp $
+## $Id: Makefile.m4,v 1.79 2004/04/04 19:42:59 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- 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.
 ##
@@ -319,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)')
@@ -367,8 +370,24 @@ 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') \
@@ -393,7 +412,7 @@ pkginclude_HEADERS = \
 	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 \
@@ -437,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 \
@@ -450,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 \
@@ -543,7 +564,7 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 ## --- Other handy definitions ---
 
 EXTRA_DIST = \
-	Makefile.m4 genmodes $(man_MANS) xpixie group-test.c \
+	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 \
@@ -551,7 +572,9 @@ EXTRA_DIST = \
 	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; \
@@ -618,6 +641,8 @@ CTESTRIG(ec-test)
 CTESTRIG(ec-info)
 CTESTRIG(dh-param)
 CTESTRIG(group-test)
+CTESTRIG(gdsa)
+CTESTRIG(gkcdsa)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)