X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/3688eb757240b2332f67ec827be8caf6f6abe924..80be023065ced106a4078a36371c135a60d2bd6c:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 9753dc3..0025dc6 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,36 +85,36 @@ 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)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
-_item`'-tab.h: _item`'-mktab
+_item`'-tab.h: _item`'-mktab$(EXEEXT)
 	./_item`'-mktab >_item`'-tab.h.new
 	mv _item`'-tab.h.new _item`'-tab.h')dnl
 gen_tables
 
 primetab.h: primetab.c
-primetab.c: genprimes
+primetab.c: genprimes$(EXEEXT)
 	./genprimes -h primetab.h -c primetab.c \
 		-s CATACOMB_PRIMETAB_H -n 256 \
 		-t "unsigned short" -i primetab
 archinclude_HEADERS = mptypes.h
-mptypes.h: mptypes
+mptypes.h: mptypes$(EXEEXT)
 	./mptypes >mptypes.h.new
 	mv mptypes.h.new mptypes.h
 
-ectab.c: ectab.in ec-gentab.awk mpdump
+ectab.c: ectab.in ec-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
 	mv ectab.c.new ectab.c
 
-ptab.c: ptab.in p-gentab.awk mpdump
+ptab.c: ptab.in p-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
 	mv ptab.c.new ptab.c
 
-bintab.c: bintab.in bin-gentab.awk mpdump
+bintab.c: bintab.in bin-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/bin-gentab.awk <$(srcdir)/bintab.in >bintab.c.new
 	mv bintab.c.new bintab.c
 
@@ -154,20 +155,20 @@ 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 group.h group-guts.h \
+	ptab.h bintab.h group.h group-guts.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.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,23 +191,24 @@ 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')
 
 define(`PGEN_SOURCES',
 	`pfilt.c rabin.c \
-	pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
-	limlee.c \
+	pgen.c pgen-stdev.c pgen-gcd.c pgen-simul.c \
+	  prim.c strongprime.c limlee.c \
 	keycheck.c keycheck-mp.c keycheck-report.c \
 	bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
 	rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
 	oaep.c pkcs1.c pss.c \
-	dh-gen.c dh-limlee.c dh-check.c dh-fetch.c dh-param.c \
+	dh-gen.c dh-limlee.c dh-kcdsa.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 \
@@ -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,14 +253,15 @@ 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 = \
 	genprimes mptypes serpent-check bittest mpdump \
 	perftest \
 	addsuffix(`gen_tables', `-mktab')
-LDADD = libcatacomb.la libcatcrypt.a
+LDADD = libcatcrypt.a libcatacomb.la
 
 define(`LIBCAT_SRC', `cc.h getdate.h dnl
 	cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
@@ -270,13 +274,15 @@ 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 =
+pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
 bittest_LDADD = 
@@ -301,6 +307,7 @@ mpdump_SOURCES = \
 	mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
 	mptext.c mptext-string.c
 mpdump_LDADD =
+mpdump_CFLAGS = $(AM_CFLAGS)
 
 ## --- Install the pixie setuid-root if we can ---
 ##
@@ -308,7 +315,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 +330,18 @@ 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 mkphrase.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 \
@@ -358,11 +369,11 @@ define(`testprogs', `')
 
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
-	$1.t)dnl
+	$1.t$(EXEEXT))dnl
 $1.to: $1.c
 	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
-$1.t: $1.to libcatacomb.la
-	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
+$1.t$(EXEEXT): $1.to libcatacomb.la
+	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t$(EXEEXT)')
 
 CTESTRIG(rc4)
 CTESTRIG(seal)
@@ -421,8 +432,8 @@ CTESTRIG(rho)
 TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
-	*.t *.to \
-	mptypes.h primetab.c primetab.h ectab.c \
+	*.t$(EXEEXT) *.to \
+	mptypes.h primetab.c primetab.h ectab.c ptab.c bintab.c \
 	addsuffix(`gen_tables', `-tab.h')
 
 ## --- Makefile building (haha!) ---