## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.24 2000/02/12 18:22:26 mdw Exp $
+## $Id: Makefile.m4,v 1.43 2000/10/08 16:01:26 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## 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.
+##
+## Revision 1.38 2000/07/29 10:54:55 mdw
+## Further fixing to support building using normal `make' again. ;-) I
+## think we're there now.
+##
+## Revision 1.37 2000/07/29 10:02:36 mdw
+## Lots of fixing to support `make -j' building.
+##
+## Revision 1.36 2000/07/20 20:13:38 mdw
+## Added Bellare and Rogaway's PSS encoding for RSA signatures.
+##
+## Revision 1.35 2000/07/16 20:00:46 mdw
+## Bug fixes to distribution.
+##
+## Revision 1.34 2000/07/15 20:55:32 mdw
+## More hashes and ciphers. An extra tool.
+##
+## Revision 1.33 2000/07/09 21:34:15 mdw
+## New hash functions and other stuff.
+##
+## Revision 1.32 2000/07/01 11:27:32 mdw
+## Name changes and new files.
+##
+## Revision 1.31 2000/06/25 13:02:07 mdw
+## Fix cleaning of generated files.
+##
+## Revision 1.30 2000/06/22 19:10:33 mdw
+## Fix Makefile to test mp-sqrt.c.
+##
+## Revision 1.29 2000/06/22 19:04:19 mdw
+## More new functions to be added.
+##
+## Revision 1.28 2000/06/18 23:31:18 mdw
+## Rearrange build order to ensure that `mptypes.h' exists by the time it's
+## needed.
+##
+## Revision 1.27 2000/06/17 13:28:50 mdw
+## Minor tidying and fixing.
+##
+## Revision 1.26 2000/06/17 10:33:43 mdw
+## Lots of new ciphers and other files.
+##
+## Revision 1.25 2000/02/12 18:55:40 mdw
+## Make it all compile properly.
+##
## Revision 1.24 2000/02/12 18:22:26 mdw
## Missed a file. Whoops.
##
AUTOMAKE_OPTIONS = foreign
+SUBDIRS = tests
+
archincludedir = $(libdir)/catacomb/include
## --- List handling macros ---
## --- Autogenerated source files ---
-define(`ciphers', `_(des) _(des3) _(blowfish) _(idea) _(rc5)')
-define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb)')
-
-define(`hashes', `_(md5) _(md4) _(rmd160) _(sha)')
-define(`hash_modes', `_(hmac)')
+define(`ciphers', `dnl
+_(des) _(des3) dnl
+_(idea) dnl
+_(blowfish) _(twofish) dnl
+_(tea) _(xtea) dnl
+_(rc2) _(rc5) dnl
+_(skipjack) dnl
+_(cast128) _(cast256) dnl
+_(square) _(rijndael) dnl
+_(serpent)')
+define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
+
+define(`hashes', `dnl
+_(md5) _(md4) _(sha) _(tiger) dnl
+_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
+define(`hash_modes', `_(mgf) _(hmac)')
MODES = \
adorn(`$(srcdir)/', join(`ciphers', `-', `cipher_modes'), `.c') \
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.c') \
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
-$(MODES): $(srcdir)/genmodes
+$(MODES): modes-stamp
+modes-stamp: genmodes
cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')"
cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
-
-des_sp.h: des-mktab
- ./des-mktab >des_sp.h
-
-primetab.c primetab.h: genprimes
- ./genprimes -h primetab.h -c primetab.c -m 255 -t "unsigned char" -i primetab
-
+ echo datestamp >modes-stamp
+
+define(`gen_tables', `dnl
+_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
+_(gfshare) _(gfx-sqr)')
+
+autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
+define(`emit', `
+_item`'-tab.h: _item`'-mktab
+ ./_item`'-mktab >_item`'-tab.h')dnl
+gen_tables
+
+primetab.h: primetab.c
+primetab.c: genprimes
+ ./genprimes -h primetab.h -c primetab.c -n 256 \
+ -t "unsigned short" -i primetab
archinclude_HEADERS = mptypes.h
-
mptypes.h: mptypes
./mptypes >mptypes.h
lib_LTLIBRARIES = libcatacomb.la
-libcatacomb_la_LDFLAGS = -version-info 1:0:0
+libcatacomb_la_LDFLAGS = -version-info 2:0:0
## Middle number is the patchlevel. Final number is the minor version. The
## difference between the first and last numbers is major version.
-define(`emit', `$1.h ')
pkginclude_HEADERS = \
- paranoia.h \
- blkc.h hash.h \
- gcipher.h ghash.h gmac.h grand.h \
- ghash-def.h \
- rc4.h \
- rand.h noise.h \
+ arena.h paranoia.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 \
- lcrand.h fibrand.h \
mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
- mpbarrett.h mpmont.h mpcrt.h \
- mprand.h \
- primetab.h pfilt.h primorial.h rabin.h \
- pgen.h prim.h strongprime.h \
+ mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.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 \
+ gfshare.h share.h \
+ rho.h \
allwithsuffix(`ciphers', `cipher_modes', `.h') \
allwithsuffix(`hashes', `hash_modes', `.h') \
addsuffix(`cipher_modes', `-def.h') \
addsuffix(`hash_modes', `-def.h')
-define(`emit', `$1.c ')
-libcatacomb_la_SOURCES = \
- grand.c \
- des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
- rc4.c \
- rand.c noise.c \
- key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
- key-misc.c key-file.c key-attr.c key-io.c key-moan.c key-error.c \
- passphrase.c pixie-client.c pixie-common.c lmem.c \
- lcrand.c fibrand.c \
- mpx.c mpx-kmul.c mpx-ksqr.c 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-gcd.c mp-jacobi.c \
- mpint.c \
- mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
- mpbarrett.c mpmont.c mpmont-mexp.c \
- mpcrt.c \
- mprand.c \
- primetab.c pfilt.c rabin.c primorial.c \
- pgen.c pgen-stdev.c pgen-safe.c prim.c strongprime.c \
- bbs-rand.c bbs-gen.c bbs-jump.c \
- rsa-decrypt.c rsa-gen.c rsa-recover.c \
- dh-gen.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 \
+ 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 \
+ dh-gen.c dh-limlee.c dh-fetch.c \
dsarand.c dsa-sign.c dsa-verify.c dsa-gen.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 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')
-des-base.lo: des_sp.h
-mpx.lo: mptypes.h
+des-base.lo: des-tab.h
+blowfish.lo: blowfish-tab.h
+twofish.lo: twofish-tab.h
+square.lo: square-tab.h
+rijndael.lo: rijndael-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
+patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
## --- Utility programs ---
-bin_PROGRAMS = key pixie rspit distsig
+bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
bin_SCRIPTS = catacomb-config xpixie
-noinst_PROGRAMS = des-mktab genprimes mptypes
+noinst_PROGRAMS = \
+ genprimes mptypes serpent-check \
+ addsuffix(`gen_tables', `-mktab')
LDADD = libcatacomb.la
+dsig_SOURCES = dsig.c getdate.y getdate.h
key_SOURCES = keyutil.c getdate.y getdate.h
-
-pixie_SOURCES = pixie.c pixie-common.c lmem.c
-pixie_LDADD =
-
+hashsum_SOURCES = hashsum.c
rspit_SOURCES = rspit.c
+factorial_SOURCES = factorial.c
+pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
+pixie_LDADD =
+mkphrase_SOURCES = mkphrase.c
-distsig_SOURCES = distsig.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 =
+serpent_check_SOURCES = serpent-check.c
+serpent_check_LDADD =
genprimes_SOURCES = genprimes.c
genprimes_LDADD =
mptypes_LDADD =
## --- Install the pixie setuid-root if we can ---
+##
+## Bodge around a bug in Automake: it doesn't call `install-exec-hook' from
+## `install' if there are subdirectories.
changequote(<, >)
+install: install-exec-hook
install-exec-hook:
@pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
if chown root $$pixie && chmod 4755 $$pixie; then \
## --- Documentation ---
-man_MANS = key.1 keyring.5
+man_MANS = key.1 hashsum.1 keyring.5 pixie.1
## --- Other handy definitions ---
dist-hook:
@ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
- @mkdir $(distdir)/tests
- @ln $(srcdir)/tests/* $(distdir)/tests || true
- @rm -f $(distdir)/tests/*~
+ @echo datestamp >$(distdir)/modes-stamp || true
+ @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); \
+# ../key -k $$kr extract -f -secret KEYRING; \
+# find . -type f -print0 | ../dsig -k $$kr sign -0 -oMANIFEST; \
+# fi
## --- Testing ---
$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
CTESTRIG(rc4)
+CTESTRIG(seal)
adorn(`nl`'CTESTRIG(', `ciphers', `)')
adorn(`nl`'CTESTRIG(', `hashes', `)')
adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
CTESTRIG(lcrand)
+CTESTRIG(oaep)
CTESTRIG(mpx)
CTESTRIG(mpx-kmul)
CTESTRIG(mpx-ksqr)
CTESTRIG(mp-arith)
+CTESTRIG(mp-modsqrt)
CTESTRIG(mp-gcd)
CTESTRIG(mp-jacobi)
+CTESTRIG(mp-sqrt)
CTESTRIG(mptext)
CTESTRIG(mpint)
CTESTRIG(mpbarrett)
CTESTRIG(mpmont)
CTESTRIG(mpmont-mexp)
CTESTRIG(mpcrt)
+CTESTRIG(mpmul)
+CTESTRIG(gfx)
+CTESTRIG(gfx-kmul)
CTESTRIG(pgen)
CTESTRIG(dsa-gen)
CTESTRIG(dsa-sign)
CTESTRIG(dsa-verify)
CTESTRIG(bbs-rand)
CTESTRIG(bbs-jump)
+CTESTRIG(gfshare)
+CTESTRIG(share)
+CTESTRIG(rho)
-TESTS = testprogs
+TESTS = serpent-check testprogs
-CLEANFILES = *.t *.to mptypes.h des_sp.h primetab.c primetab.h
+CLEANFILES = \
+ *.t *.to \
+ mptypes.h primetab.c primetab.h \
+ addsuffix(`gen_tables', `-tab.h')
## --- Makefile building (haha!) ---
$(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
+DISTCLEANFILES = libtool
+
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \
- $(MODES)
+ $(MODES) modes-stamp $(srcdir)/modes-stamp
##----- That's all, folks ---------------------------------------------------