## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.35 2000/07/16 20:00:46 mdw Exp $
+## $Id: Makefile.m4,v 1.53 2001/04/29 18:11:19 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## Revision 1.53 2001/04/29 18:11:19 mdw
+## New block cipher MARS.
+##
+## Revision 1.52 2001/04/29 17:37:35 mdw
+## Added SAFER block cipher.
+##
+## Revision 1.51 2001/04/19 18:26:32 mdw
+## Add CRC as another hash function.
+##
+## Revision 1.50 2001/04/06 22:05:10 mdw
+## Add support for SSL pseudo-random function.
+##
+## Revision 1.49 2001/04/04 20:10:52 mdw
+## Add support for the TLS pseudo-random function.
+##
+## Revision 1.48 2001/04/03 19:36:50 mdw
+## New block cipher DESX added.
+##
+## Revision 1.47 2001/03/03 13:14:13 mdw
+## Distribute md2-tab.h
+##
+## Revision 1.46 2001/02/21 20:03:22 mdw
+## Added support for MD2 hash function.
+##
+## Revision 1.45 2001/02/03 16:09:41 mdw
+## New files added.
+##
+## 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.
+##
+## 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.
##
## --- Autogenerated source files ---
define(`ciphers', `dnl
-_(des) _(des3) dnl
-_(idea) dnl
+_(des) _(desx) _(des3) _(mars) dnl
+_(idea) _(safer) _(safersk) dnl
_(blowfish) _(twofish) dnl
_(tea) _(xtea) dnl
_(rc2) _(rc5) dnl
define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
define(`hashes', `dnl
-_(md5) _(md4) _(sha) _(tiger) dnl
+_(md5) _(md4) _(md2) _(tiger) dnl
+_(sha) _(sha256) _(sha384) _(sha512) dnl
_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
define(`hash_modes', `_(mgf) _(hmac)')
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.c') \
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
-$(MODES):
+$(MODES): modes-stamp
+modes-stamp: genmodes
cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')"
cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
-
-des-tab.h: des-mktab
- ./des-mktab >des-tab.h
-blowfish-tab.h: blowfish-mktab
- ./blowfish-mktab >blowfish-tab.h
-twofish-tab.h: twofish-mktab
- ./twofish-mktab >twofish-tab.h
-square-tab.h: square-mktab
- ./square-mktab >square-tab.h
-rijndael-tab.h: rijndael-mktab
- ./rijndael-mktab >rijndael-tab.h
-tiger-tab.h: tiger-mktab
- ./tiger-mktab >tiger-tab.h
-gfshare-tab.h: gfshare-mktab
- ./gfshare-mktab >gfshare-tab.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) 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`'-mktab >_item`'-tab.h
+_item`'.lo: _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
BUILT_SOURCES = \
getdate.c \
- des-tab.h blowfish-tab.h twofish-tab.h rijndael-tab.h \
- gfshare-tab.h \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
pkginclude_HEADERS = \
arena.h paranoia.h \
- blkc.h hash.h \
- gcipher.h ghash.h gmac.h grand.h \
- ghash-def.h \
- rc4.h seal.h \
- rand.h noise.h fipstest.h maurer.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 mpmul.h \
- primetab.h pfilt.h primorial.h rabin.h \
- pgen.h prim.h strongprime.h limlee.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 keycheck.h \
bbs.h rsa.h dh.h dsarand.h dsa.h \
- oaep.h pkcs1.h \
+ oaep.h pkcs1.h pss.h tlsprf.h sslprf.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')
+ addsuffix(`hash_modes', `-def.h') crc32.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 \
- rc4.c seal.c \
- rand.c noise.c fipstest.c maurer.c \
- arena.c \
- passphrase.c pixie-client.c pixie-common.c lmem.c \
- lcrand.c fibrand.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 \
- primetab.c pfilt.c rabin.c primorial.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 \
+ 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 \
- dh-gen.c dh-fetch.c \
- dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.c \
- gfshare.c share.c \
- rho.c \
+ dh-gen.c dh-limlee.c dh-check.c dh-fetch.c \
+ dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.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 \
+ 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 tlsprf.c sslprf.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 \
+ md2-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')
+ addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c') crc32.c
des-base.lo: des-tab.h
blowfish.lo: blowfish-tab.h
square.lo: square-tab.h
rijndael.lo: rijndael-tab.h
tiger.lo: tiger-tab.h
-mpx.lo: mptypes.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 = 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 =
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 || true
- @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); \
adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
CTESTRIG(lcrand)
CTESTRIG(oaep)
+CTESTRIG(tlsprf)
+CTESTRIG(sslprf)
CTESTRIG(mpx)
CTESTRIG(mpx-kmul)
CTESTRIG(mpx-ksqr)
CTESTRIG(mpmont-mexp)
CTESTRIG(mpcrt)
CTESTRIG(mpmul)
+CTESTRIG(gfx)
+CTESTRIG(gfx-kmul)
CTESTRIG(pgen)
CTESTRIG(dsa-gen)
CTESTRIG(dsa-sign)
CLEANFILES = \
*.t *.to \
mptypes.h primetab.c primetab.h \
- des-tab.h twofish-tab.h blowfish-tab.h gfshare-tab.h rijndael-tab.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 ---------------------------------------------------
projects / u / mdw / catacomb / blobdiff