X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f4535c6454395e6d56ce0091a07b6d4f7d54a47f..21aac40c87e498ae0a8c4c3d0960ca298a89b54c:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index b269aee..c462e0b 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,7 +155,7 @@ 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 mp-exp.h \
 	mpcrt.h mprand.h mpmul.h \
@@ -165,7 +166,7 @@ pkginclude_HEADERS = \
 	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') \
@@ -194,7 +195,8 @@ define(`GF_SOURCES',
 	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')
 
@@ -218,7 +220,7 @@ 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 \
-	passphrase.c pixie-client.c pixie-common.c lmem.c \
+	passphrase.c pixie-common.c lmem.c \
 	tlsprf.c sslprf.c \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
@@ -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
@@ -250,7 +253,8 @@ gfx-sqr.lo: gfx-sqr-tab.h
 ## --- Utility programs ---
 
 bin_PROGRAMS = \
-	dsig key pixie cookie rspit factorial hashsum mkphrase catcrypt
+	dsig key pixie cookie rspit factorial hashsum mkphrase \
+	catcrypt catsign
 noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
@@ -270,12 +274,13 @@ patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
 dsig_SOURCES = dsig.c
 cookie_SOURCES = cookie.c
 catcrypt_SOURCES = catcrypt.c
+catsign_SOURCES = catsign.c
 key_SOURCES = keyutil.c
 hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
-pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
+pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
@@ -308,7 +313,7 @@ mpdump_LDADD =
 ## `install' if there are subdirectories.
 
 changequote(<, >)
-install: install-exec-hook
+# install: install-exec-hook
 install-exec-hook:
 	@pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \
 	if chown root $$pixie && chmod 4755 $$pixie; then \
@@ -323,14 +328,16 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 dsig.1 cookie.1 catcrypt.1 hashsum.1 keyring.5 pixie.1
+man_MANS = \
+	key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 \
+	keyring.5 pixie.1
 
 ## --- Other handy definitions ---
 
 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 \