X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..1256557a009c0399ce086335cd35c1bd3f5dfbd2:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 890dc8f..36c7422 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.80 2004/04/08 01:36:15 mdw Exp $
+## $Id$
 ##
 ## Makefile for Catacomb
 ##
@@ -113,6 +113,10 @@ ptab.c: ptab.in p-gentab.awk mpdump
 	$(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
 	mv ptab.c.new ptab.c
 
+bintab.c: bintab.in bin-gentab.awk mpdump
+	$(srcdir)/bin-gentab.awk <$(srcdir)/bintab.in >bintab.c.new
+	mv bintab.c.new bintab.c
+
 gciphertab.c: gengctab
 	$(srcdir)/gengctab gccipher gcipher >gciphertab.c.new \
 		"lit(join(`ciphers', `-', `cipher_modes')) \
@@ -150,19 +154,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 ec.h ec-exp.h ec-test.h ectab.h ec-keys.h ec-raw.h \
-	ptab.h group.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') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.h') \
@@ -171,24 +176,26 @@ 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 \
 	mpbarrett.c mpbarrett-exp.c mpbarrett-mexp.c mpbarrett-exp.h \
 	mpmont.c mpmont-exp.c mpmont-mexp.c mpmont-exp.h \
 	mpreduce.c mpreduce-exp.h \
-	group-stdops.c group-exp.c group-exp.h g-prime.c group-parse.c \
+	group-stdops.c group-exp.c group-exp.h g-prime.c g-bin.c \
+	  group-parse.c \
 	group-string.c group-file.c group-dstr.c \
-	rho.c buf.c ptab.c \
+	rho.c buf.c ptab.c bintab.c \
 	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')
 
@@ -199,6 +206,7 @@ define(`PGEN_SOURCES',
 	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 \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
 	gdsa.c gkcdsa.c \
@@ -212,7 +220,7 @@ libcatacomb_la_SOURCES = \
 	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 \
-	oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
+	tlsprf.c sslprf.c \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
 	gciphertab.c ghashtab.c gmactab.c \
@@ -239,23 +247,35 @@ mars.lo: mars-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 primetab.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
+bin_PROGRAMS = \
+	dsig key pixie cookie rspit factorial hashsum mkphrase catcrypt
+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
+LDADD = libcatacomb.la libcatcrypt.a
 
-dsig_SOURCES = dsig.c getdate.y getdate.h
-key_SOURCES = keyutil.c getdate.y getdate.h
+define(`LIBCAT_SRC', `cc.h getdate.h dnl
+	cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
+libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
+
+patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
+	patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
+	mptypes.h primetab.h
+	
+dsig_SOURCES = dsig.c
+cookie_SOURCES = cookie.c
+catcrypt_SOURCES = catcrypt.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_LDADD =
 mkphrase_SOURCES = mkphrase.c
@@ -304,14 +324,14 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 hashsum.1 keyring.5 pixie.1
+man_MANS = key.1 dsig.1 cookie.1 catcrypt.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 \
+	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 \