## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.39 2000/07/29 21:55:32 mdw Exp $
+## $Id: Makefile.m4,v 1.44 2000/10/15 17:49:00 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## Revision 1.44 2000/10/15 17:49:00 mdw
+## New SHA variants with longer outputs.
+##
+## Revision 1.43 2000/10/08 16:01:26 mdw
+## Add binary poly arithmetic. Tidy table generation stuff. Distribute
+## calc prototypes.
+##
+## Revision 1.42 2000/10/08 12:16:06 mdw
+## Remove vestiges of @primorial@.
+##
+## Revision 1.41 2000/08/15 21:46:20 mdw
+## Set up the dependencies on primetab.[ch] and mptypes.h properly.
+## There's some m4 hacking, but it's worth it not to have to recompile all
+## the cipher modes.
+##
+## Revision 1.40 2000/08/06 10:50:55 mdw
+## (mkphrase): New program for generating random passphrases with measured
+## strength.
+##
## Revision 1.39 2000/07/29 21:55:32 mdw
## Make sure the pixie is installed setuid-root (workaround for an Automake
## bug). Install new manpages.
define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
define(`hashes', `dnl
-_(md5) _(md4) _(sha) _(tiger) dnl
+_(md5) _(md4) _(tiger) dnl
+_(sha) _(sha256) _(sha384) _(sha512) dnl
_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
define(`hash_modes', `_(mgf) _(hmac)')
define(`gen_tables', `dnl
_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
-_(gfshare)')
+_(gfshare) _(gfx-sqr)')
autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
define(`emit', `
primetab.h: primetab.c
primetab.c: genprimes
- ./genprimes -h primetab.h -c primetab.c -m 255 \
- -t "unsigned char" -i primetab
+ ./genprimes -h primetab.h -c primetab.c -n 256 \
+ -t "unsigned short" -i primetab
archinclude_HEADERS = mptypes.h
mptypes.h: mptypes
./mptypes >mptypes.h
key.h key-data.h passphrase.h pixie.h lmem.h \
mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
- primetab.h pfilt.h primorial.h rabin.h \
+ gfx.h \
+ primetab.h pfilt.h rabin.h \
pgen.h prim.h strongprime.h limlee.h \
bbs.h rsa.h dh.h dsarand.h dsa.h \
oaep.h pkcs1.h pss.h \
addsuffix(`cipher_modes', `-def.h') \
addsuffix(`hash_modes', `-def.h')
-libcatacomb_la_SOURCES = \
- grand.c keysz.c \
- des-base.c des-base.h \
- cast-s.c cast-sk.c cast-base.h cast-tab.h \
- serpent-sbox.h skipjack-tab.h tiger-base.h \
- daftstory.h \
- 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 \
- mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h mpscan.c mparena.c \
+define(`MP_SOURCES',
+ `mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.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 \
mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
mpbarrett.c mpmont.c mpmont-mexp.c mpcrt.c mpmul.c mprand.c \
- pfilt.c rabin.c primorial.c \
+ rho.c \
+ GF_SOURCES PGEN_SOURCES')
+
+define(`GF_SOURCES',
+ `gfx.c gfx-kmul.c gfx-sqr.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 \
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-fetch.c \
dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \
- gfshare.c share.c \
- rho.c \
key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \
key-error.c key-fetch.c \
- primetab.c \
+ primetab.c share.c')
+
+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 \
+ oaep.c pkcs1.c pss.c \
+ gfshare.c \
+ MP_SOURCES karatsuba.h \
+ des-base.c des-base.h \
+ cast-s.c cast-sk.c cast-base.h cast-tab.h \
+ serpent-sbox.h skipjack-tab.h tiger-base.h \
+ daftstory.h \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
rijndael.lo: rijndael-tab.h
tiger.lo: tiger-tab.h
gfshare.lo: gfshare-tab.h
-$(libcatacomb_la_OBJECTS) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
+gfx-sqr.lo: gfx-sqr-tab.h
+patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: mptypes.h
+patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
## --- Utility programs ---
-bin_PROGRAMS = dsig key pixie rspit factorial hashsum
+bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
bin_SCRIPTS = catacomb-config xpixie
noinst_PROGRAMS = \
- genprimes mptypes \
- des-mktab blowfish-mktab twofish-mktab square-mktab rijndael-mktab \
- tiger-mktab serpent-check \
- gfshare-mktab
+ genprimes mptypes serpent-check \
+ addsuffix(`gen_tables', `-mktab')
LDADD = libcatacomb.la
dsig_SOURCES = dsig.c getdate.y getdate.h
factorial_SOURCES = factorial.c
pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
pixie_LDADD =
+mkphrase_SOURCES = mkphrase.c
+
+define(`emit', `
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_LDADD =')dnl
+gen_tables
-des_mktab_SOURCES = des-mktab.c
-des_mktab_LDADD =
-blowfish_mktab_SOURCES = blowfish-mktab.c
-blowfish_mktab_LDADD =
-twofish_mktab_SOURCES = twofish-mktab.c
-twofish_mktab_LDADD =
-square_mktab_SOURCES = square-mktab.c
-square_mktab_LDADD =
-rijndael_mktab_SOURCES = rijndael-mktab.c
-rijndael_mktab_LDADD =
serpent_check_SOURCES = serpent-check.c
serpent_check_LDADD =
-gfshare_mktab_SOURCES = gfshare-mktab.c
-gfshare_mktab_LDADD =
-tiger_mktab_SOURCES = tiger-mktab.c
-tiger_mktab_LDADD =
genprimes_SOURCES = genprimes.c
genprimes_LDADD =
dist-hook:
@ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
@echo datestamp >$(distdir)/modes-stamp || true
- @mkdir $(distdir)/tests || true
- @ln $(srcdir)/tests/* $(distdir)/tests || true
- @rm -f $(distdir)/tests/*~
+ @for i in calc tests; do \
+ mkdir $(distdir)/$$i; \
+ ln $(srcdir)/$$i/*[!~] $(distdir)/$$i; \
+ done || true
# kr=$$HOME/.catacomb/dsig-keyring; \
# if [ -r $$kr ]; then \
# cd $(distdir); \
CTESTRIG(mpmont-mexp)
CTESTRIG(mpcrt)
CTESTRIG(mpmul)
+CTESTRIG(gfx)
+CTESTRIG(gfx-kmul)
CTESTRIG(pgen)
CTESTRIG(dsa-gen)
CTESTRIG(dsa-sign)
$(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
+DISTCLEANFILES = libtool
+
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \