X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/cedaf333d7f753527eae68a91ca82accb943f970..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 36c7422..2b869f4 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)')
 
@@ -219,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 \
@@ -242,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
@@ -251,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 = \
@@ -271,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
@@ -324,7 +328,9 @@ 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 ---