## -*-m4-*-
##
-## $Id: Makefile.m4,v 1.81 2004/04/08 16:17:32 mdw Exp $
+## $Id$
##
## Makefile for Catacomb
##
$(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')) \
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') \
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')
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
## --- 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 \