X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e40955b56456a6191ebff48b00c667a0674b3bdb..7fcfe7de9c3227fedee03b56e7f69fd9646d4e38:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 0fac1c4..80e697d 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -67,6 +67,7 @@ define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 define(`hashes', `dnl
 _(md5) _(md4) _(md2) _(tiger) _(has160) dnl
 _(sha) _(sha224) _(sha256) _(sha384) _(sha512) dnl
+_(whirlpool) _(whirlpool256) dnl
 _(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
 
@@ -84,7 +85,7 @@ modes-stamp: genmodes
 
 define(`gen_tables', `dnl
 _(des) _(blowfish) _(twofish) dnl
-_(square) _(rijndael) dnl
+_(square) _(rijndael) _(whirlpool) dnl
 _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
@@ -154,18 +155,18 @@ pkginclude_HEADERS = \
 	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 \
+	key.h key-error.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 mpreduce.h \
+	exp.h mpbarrett.h mpmont.h mpreduce.h mp-exp.h \
 	mpcrt.h mprand.h mpmul.h \
-	gfx.h gf.h gfreduce.h gfn.h \
+	gfx.h gf.h gfreduce.h gfn.h gf-exp.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 gdsa.h gkcdsa.h \
 	tlsprf.h sslprf.h \
 	gfshare.h share.h \
 	rho.h \
-	field.h field-guts.h \
+	field.h field-guts.h field-exp.h \
 	ec.h ec-guts.h ec-exp.h ec-test.h ectab.h ec-keys.h ec-raw.h \
 	ptab.h bintab.h group.h group-guts.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
@@ -176,7 +177,7 @@ pkginclude_HEADERS = \
 define(`MP_SOURCES',
 	`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 \
+	mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c mp-exp.c \
 	mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
 	mptext-len.c \
 	exp.c mpcrt.c mpmul.c mprand.c \
@@ -190,11 +191,12 @@ define(`MP_SOURCES',
 	GF_SOURCES PGEN_SOURCES EC_SOURCES')
 
 define(`GF_SOURCES',
-	`gfx.c gfx-kmul.c gfx-sqr.c gf-arith.c gf-gcd.c \
+	`gfx.c gfx-kmul.c gfx-sqr.c gf-arith.c gf-exp.c gf-gcd.c \
 	gfreduce.c gfreduce-exp.h gfn.c')
 
 define(`EC_SOURCES',
-	`field.c field-parse.c f-prime.c f-niceprime.c f-binpoly.c \
+	`field.c field-parse.c field-exp.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 ec-raw.c g-ec.c')
 
@@ -241,6 +243,7 @@ blowfish.lo: blowfish-tab.h
 twofish.lo: twofish-tab.h
 square.lo: square-tab.h
 rijndael-base.lo: rijndael-tab.h
+whirlpool.lo: whirlpool-tab.h
 safer.lo: safer-tab.h
 mars.lo: mars-tab.h
 tiger.lo: tiger-tab.h
@@ -330,7 +333,7 @@ man_MANS = key.1 dsig.1 cookie.1 catcrypt.1 hashsum.1 keyring.5 pixie.1
 EXTRA_DIST = \
 	Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
 	group-test.c rsa-test.c \
-	ectab.in ec-gentab.awk ptab.in p-gentab.awk bin-gentab.awk \
+	ectab.in ec-gentab.awk ptab.in p-gentab.awk bintab.in bin-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 \