X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/cc44d54e791d4237a81d35353d21f81f3f19c870..ff0e4a2220a51de224a551d09eaad730bd878978:/Makefile.m4 diff --git a/Makefile.m4 b/Makefile.m4 index 34528fb..45e60c6 100644 --- a/Makefile.m4 +++ b/Makefile.m4 @@ -1,6 +1,6 @@ ## -*-makefile-*- ## -## $Id: Makefile.m4,v 1.26 2000/06/17 10:33:43 mdw Exp $ +## $Id: Makefile.m4,v 1.36 2000/07/20 20:13:38 mdw Exp $ ## ## Makefile for Catacomb ## @@ -29,6 +29,37 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.m4,v $ +## 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. ## @@ -135,13 +166,17 @@ define(`ciphers', `dnl _(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 = \ @@ -156,23 +191,23 @@ $(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 -gfshare-tab.h: gfshare-mktab - ./gfshare-mktab >gfshare-tab.h - archinclude_HEADERS = mptypes.h mptypes.h: mptypes @@ -195,7 +230,6 @@ 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 = \ arena.h paranoia.h \ blkc.h hash.h \ @@ -207,46 +241,53 @@ pkginclude_HEADERS = \ 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 \ + 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') \ addsuffix(`hash_modes', `-def.h') -define(`emit', `$1.c ') 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 \ - 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 \ 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 \ + 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 \ + 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 \ + mpcrt.c mpmul.c \ mprand.c \ primetab.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 \ + 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-fetch.c \ dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.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 \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c') @@ -254,45 +295,46 @@ libcatacomb_la_SOURCES = \ 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 mpx.lo: mptypes.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 = @@ -356,18 +398,22 @@ 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(pgen) CTESTRIG(dsa-gen) CTESTRIG(dsa-sign) @@ -376,13 +422,14 @@ CTESTRIG(bbs-rand) 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 + des-tab.h twofish-tab.h blowfish-tab.h gfshare-tab.h rijndael-tab.h ## --- Makefile building (haha!) ---