## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.28 2000/06/18 23:31:18 mdw Exp $
+## $Id: Makefile.m4,v 1.38 2000/07/29 10:54:55 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## 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.
_(des) _(des3) dnl
_(idea) dnl
_(blowfish) _(twofish) dnl
+_(tea) _(xtea) dnl
_(rc2) _(rc5) dnl
+_(skipjack) dnl
_(cast128) _(cast256) dnl
-_(rijndael) dnl
+_(square) _(rijndael) dnl
_(serpent)')
define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
-define(`hashes', `_(md5) _(md4) _(rmd160) _(sha)')
+define(`hashes', `dnl
+_(md5) _(md4) _(sha) _(tiger) dnl
+_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
define(`hash_modes', `_(mgf) _(hmac)')
MODES = \
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')"
+ echo datestamp >modes-stamp
-des-tab.h: des-mktab
- ./des-mktab >des-tab.h
+define(`gen_tables', `dnl
+_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
+_(gfshare)')
-blowfish-tab.h: blowfish-mktab
- ./blowfish-mktab >blowfish-tab.h
+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
-twofish-tab.h: twofish-mktab
- ./twofish-mktab >twofish-tab.h
-
-rijndael-tab.h: rijndael-mktab
- ./rijndael-mktab >rijndael-tab.h
-
-primetab.c primetab.h: genprimes
+primetab.h: primetab.c
+primetab.c: genprimes
./genprimes -h primetab.h -c primetab.c -m 255 \
-t "unsigned char" -i primetab
-
-gfshare-tab.h: gfshare-mktab
- ./gfshare-mktab >gfshare-tab.h
-
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 \
+ mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
primetab.h pfilt.h primorial.h rabin.h \
- pgen.h prim.h strongprime.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') \
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 \
+ serpent-sbox.h skipjack-tab.h tiger-base.h \
daftstory.h \
- rc4.c seal.c \
- rand.c noise.c fipstest.c maurer.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 \
- lcrand.c fibrand.c \
mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h 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 \
+ 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 \
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-decrypt.c rsa-gen.c rsa-recover.c rsa-fetch.c \
- dh-gen.c dh-fetch.c \
- dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-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 \
+ 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 \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
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
-mpx.lo: mptypes.h
+tiger.lo: tiger-tab.h
+gfshare.lo: gfshare-tab.h
+$(libcatacomb_la_OBJECTS) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
## --- Utility programs ---
-bin_PROGRAMS = dsig key pixie rspit
+bin_PROGRAMS = dsig key pixie rspit factorial hashsum
bin_SCRIPTS = catacomb-config xpixie
noinst_PROGRAMS = \
genprimes mptypes \
- des-mktab blowfish-mktab twofish-mktab rijndael-mktab serpent-check \
+ des-mktab blowfish-mktab twofish-mktab square-mktab rijndael-mktab \
+ tiger-mktab serpent-check \
gfshare-mktab
LDADD = libcatacomb.la
dsig_SOURCES = dsig.c getdate.y getdate.h
-
key_SOURCES = keyutil.c getdate.y getdate.h
-
+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 =
-rspit_SOURCES = rspit.c
-
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/*~
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(pgen)
CTESTRIG(dsa-gen)
CTESTRIG(dsa-sign)
CTESTRIG(bbs-jump)
CTESTRIG(gfshare)
CTESTRIG(share)
+CTESTRIG(rho)
-TESTS = testprogs
+TESTS = serpent-check testprogs
CLEANFILES = \
*.t *.to \
mptypes.h primetab.c primetab.h \
- des-sp.h twofish-tab.h blowfish-tab.h
+ addsuffix(`gen_tables', `-tab.h')
## --- Makefile building (haha!) ---
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