X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/3fe3eae5e61875c7f3f177c5ccce2f0cf6787216..eee161205f1139ee49e81c8efa33fe18380c917b:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index c51d03f..f93c24f 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.41 2000/08/15 21:46:20 mdw Exp $
+## $Id: Makefile.m4,v 1.44 2000/10/15 17:49:00 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,16 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.44  2000/10/15 17:49:00  mdw
+## New SHA variants with longer outputs.
+##
+## Revision 1.43  2000/10/08 16:01:26  mdw
+## Add binary poly arithmetic.  Tidy table generation stuff.  Distribute
+## calc prototypes.
+##
+## Revision 1.42  2000/10/08 12:16:06  mdw
+## Remove vestiges of @primorial@.
+##
 ## Revision 1.41  2000/08/15 21:46:20  mdw
 ## Set up the dependencies on primetab.[ch] and mptypes.h properly.
 ## There's some m4 hacking, but it's worth it not to have to recompile all
@@ -195,7 +205,8 @@ _(serpent)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
-_(md5) _(md4) _(sha) _(tiger) dnl
+_(md5) _(md4) _(tiger) dnl
+_(sha) _(sha256) _(sha384) _(sha512) dnl
 _(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
 
@@ -213,7 +224,7 @@ modes-stamp: genmodes
 
 define(`gen_tables', `dnl
 _(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
-_(gfshare)')
+_(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
@@ -251,7 +262,8 @@ pkginclude_HEADERS = \
 	key.h key-data.h passphrase.h pixie.h lmem.h \
 	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
 	mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
-	primetab.h pfilt.h primorial.h rabin.h \
+	gfx.h \
+	primetab.h pfilt.h rabin.h \
 	pgen.h prim.h strongprime.h limlee.h \
 	bbs.h rsa.h dh.h dsarand.h dsa.h \
 	oaep.h pkcs1.h pss.h \
@@ -269,10 +281,13 @@ define(`MP_SOURCES',
 	mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
 	mpbarrett.c mpmont.c mpmont-mexp.c mpcrt.c mpmul.c mprand.c \
 	rho.c \
-	PGEN_SOURCES')
+	GF_SOURCES PGEN_SOURCES')
+
+define(`GF_SOURCES',
+	`gfx.c gfx-kmul.c gfx-sqr.c')
 
 define(`PGEN_SOURCES',
-	`pfilt.c rabin.c primorial.c \
+	`pfilt.c rabin.c \
 	pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
 	limlee.c \
 	bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
@@ -291,7 +306,7 @@ libcatacomb_la_SOURCES = \
 	passphrase.c pixie-client.c pixie-common.c lmem.c \
 	oaep.c pkcs1.c pss.c \
 	gfshare.c \
-	MP_SOURCES mpx-kmac.h \
+	MP_SOURCES karatsuba.h \
 	des-base.c des-base.h \
 	cast-s.c cast-sk.c cast-base.h cast-tab.h \
 	serpent-sbox.h skipjack-tab.h tiger-base.h \
@@ -307,6 +322,7 @@ square.lo: square-tab.h
 rijndael.lo: rijndael-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
+gfx-sqr.lo: gfx-sqr-tab.h
 patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: mptypes.h
 patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
 
@@ -315,10 +331,8 @@ 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 \
-	des-mktab blowfish-mktab twofish-mktab square-mktab rijndael-mktab \
-	tiger-mktab serpent-check \
-	gfshare-mktab
+	genprimes mptypes serpent-check \
+	addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la
 
 dsig_SOURCES = dsig.c getdate.y getdate.h
@@ -330,22 +344,13 @@ pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
 
-des_mktab_SOURCES = des-mktab.c
-des_mktab_LDADD =
-blowfish_mktab_SOURCES = blowfish-mktab.c
-blowfish_mktab_LDADD =
-twofish_mktab_SOURCES = twofish-mktab.c
-twofish_mktab_LDADD =
-square_mktab_SOURCES = square-mktab.c
-square_mktab_LDADD =
-rijndael_mktab_SOURCES = rijndael-mktab.c
-rijndael_mktab_LDADD =
+define(`emit', `
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_LDADD =')dnl
+gen_tables
+
 serpent_check_SOURCES = serpent-check.c
 serpent_check_LDADD =
-gfshare_mktab_SOURCES = gfshare-mktab.c
-gfshare_mktab_LDADD =
-tiger_mktab_SOURCES = tiger-mktab.c
-tiger_mktab_LDADD =
 
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
@@ -385,9 +390,10 @@ EXTRA_DIST = \
 dist-hook:
 	@ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
 	@echo datestamp >$(distdir)/modes-stamp || true
-	@mkdir $(distdir)/tests || true
-	@ln $(srcdir)/tests/* $(distdir)/tests || true
-	@rm -f $(distdir)/tests/*~
+	@for i in calc tests; do \
+	  mkdir $(distdir)/$$i; \
+	  ln $(srcdir)/$$i/*[!~] $(distdir)/$$i; \
+	done || true
 #	kr=$$HOME/.catacomb/dsig-keyring; \
 #	if [ -r $$kr ]; then \
 #	  cd $(distdir); \
@@ -430,6 +436,8 @@ CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
 CTESTRIG(mpmul)
+CTESTRIG(gfx)
+CTESTRIG(gfx-kmul)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
@@ -452,6 +460,8 @@ CLEANFILES = \
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
 	m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
 
+DISTCLEANFILES = libtool
+
 MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.am \
 	$(srcdir)/getdate.c getdate.c \