X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/3bef8c146b00ba0e71b0db29ef3a5b00a533a10a..34e4f738bcba58e6d8c4cabbb0b3232a65b42a9d:/Makefile.m4 diff --git a/Makefile.m4 b/Makefile.m4 index 549eac2..12c4dd0 100644 --- a/Makefile.m4 +++ b/Makefile.m4 @@ -1,6 +1,6 @@ -## -*-makefile-*- +## -*-m4-*- ## -## $Id: Makefile.m4,v 1.53 2001/04/29 18:11:19 mdw Exp $ +## $Id: Makefile.m4,v 1.75 2004/04/01 12:50:09 mdw Exp $ ## ## Makefile for Catacomb ## @@ -29,6 +29,82 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.m4,v $ +## Revision 1.75 2004/04/01 12:50:09 mdw +## Add cyclic group abstraction, with test code. Separate off exponentation +## functions for better static linking. Fix a buttload of bugs on the way. +## Generally ensure that negative exponents do inversion correctly. Add +## table of standard prime-field subgroups. (Binary field subgroups are +## currently unimplemented but easy to add if anyone ever finds a good one.) +## +## Revision 1.74 2004/03/28 01:58:47 mdw +## Generate, store and retreive elliptic curve keys. +## +## Revision 1.73 2004/03/27 18:38:00 mdw +## Fix distribution. +## +## Revision 1.72 2004/03/27 17:55:11 mdw +## Run ec-info test. +## +## Revision 1.71 2004/03/27 17:54:11 mdw +## Standard curves and curve checking. +## +## Revision 1.70 2004/03/27 00:04:46 mdw +## Implement efficient reduction for pleasant-looking primes. +## +## Revision 1.69 2004/03/23 15:19:32 mdw +## Test elliptic curves more thoroughly. +## +## Revision 1.68 2004/03/21 23:03:30 mdw +## Distribute headers properly. +## +## Revision 1.67 2004/03/21 22:52:06 mdw +## Merge and close elliptic curve branch. +## +## Revision 1.60.2.2 2004/03/21 22:39:46 mdw +## Elliptic curves on binary fields work. +## +## Revision 1.60.2.1 2003/06/10 13:43:53 mdw +## Simple (non-projective) curves over prime fields now seem to work. +## +## Revision 1.66 2004/03/21 22:43:50 mdw +## New hash variant SHA224. +## +## Revision 1.65 2003/11/29 23:39:36 mdw +## Debianization. +## +## Revision 1.64 2003/11/10 22:18:30 mdw +## Build fixes. +## +## Revision 1.63 2003/10/17 16:30:46 mdw +## Report errors if key files don't exist! +## +## Revision 1.62 2003/10/12 15:02:09 mdw +## Reliability fixes. +## +## Revision 1.61 2003/10/11 21:02:33 mdw +## Import buf stuff from tripe. +## +## Revision 1.60 2003/05/16 01:12:37 mdw +## Ship `rc2-tab.h' and `skipjack-tab.h'. +## +## Revision 1.59 2003/05/16 00:54:50 mdw +## Install pixie to fake root if wanted. Ship `desx-tab.h' +## +## Revision 1.58 2002/10/19 17:56:50 mdw +## Fix bit operations. Test them (a bit) better. +## +## Revision 1.57 2002/10/15 22:58:29 mdw +## Fast estimation of number representation lengths. +## +## Revision 1.56 2001/06/16 13:01:10 mdw +## New source files and tests. +## +## Revision 1.55 2001/05/08 22:17:41 mdw +## New cipher Noekeon added. +## +## Revision 1.54 2001/05/07 17:32:52 mdw +## New Rijndael block sizes. +## ## Revision 1.53 2001/04/29 18:11:19 mdw ## New block cipher MARS. ## @@ -227,13 +303,13 @@ _(tea) _(xtea) dnl _(rc2) _(rc5) dnl _(skipjack) dnl _(cast128) _(cast256) dnl -_(square) _(rijndael) dnl -_(serpent)') +_(square) _(rijndael) _(rijndael192) _(rijndael256) dnl +_(serpent) _(noekeon)') define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)') define(`hashes', `dnl _(md5) _(md4) _(md2) _(tiger) dnl -_(sha) _(sha256) _(sha384) _(sha512) dnl +_(sha) _(sha224) _(sha256) _(sha384) _(sha512) dnl _(rmd128) _(rmd160) _(rmd256) _(rmd320)') define(`hash_modes', `_(mgf) _(hmac)') @@ -250,27 +326,38 @@ modes-stamp: genmodes echo datestamp >modes-stamp define(`gen_tables', `dnl -_(des) _(blowfish) _(twofish) _(square) _(rijndael) dnl +_(des) _(blowfish) _(twofish) dnl +_(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 + ./_item`'-mktab >_item`'-tab.h.new + mv _item`'-tab.h.new _item`'-tab.h')dnl gen_tables primetab.h: primetab.c primetab.c: genprimes - ./genprimes -h primetab.h -c primetab.c -n 256 \ + ./genprimes -h primetab.h -c primetab.c \ + -s CATACOMB_PRIMETAB_H -n 256 \ -t "unsigned short" -i primetab archinclude_HEADERS = mptypes.h mptypes.h: mptypes - ./mptypes >mptypes.h + ./mptypes >mptypes.h.new + mv mptypes.h.new mptypes.h + +ectab.c: ectab.in ec-gentab.sh mpdump + $(srcdir)/ec-gentab.sh <$(srcdir)/ectab.in >ectab.c.new + mv ectab.c.new ectab.c + +ptab.c: ptab.in p-gentab.sh mpdump + $(srcdir)/p-gentab.sh <$(srcdir)/ptab.in >ptab.c.new + mv ptab.c.new ptab.c BUILT_SOURCES = \ - getdate.c \ + getdate.c modes-stamp \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ @@ -280,24 +367,27 @@ BUILT_SOURCES = \ lib_LTLIBRARIES = libcatacomb.la -libcatacomb_la_LDFLAGS = -version-info 2:0:0 +libcatacomb_la_LDFLAGS = -version-info 3:0:1 ## Middle number is the patchlevel. Final number is the minor version. The ## difference between the first and last numbers is major version. pkginclude_HEADERS = \ - arena.h paranoia.h \ + arena.h paranoia.h buf.h qdparse.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 \ - mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \ - mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \ - gfx.h \ + mpx.h bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \ + exp.h mpbarrett.h mpmont.h mpreduce.h \ + mpcrt.h mprand.h mpmul.h \ + gfx.h gf.h gfreduce.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 pss.h tlsprf.h sslprf.h \ gfshare.h share.h \ rho.h \ + field.h ec.h ec-exp.h ec-test.h ectab.h ec-keys.h \ + ptab.h group.h \ allwithsuffix(`ciphers', `cipher_modes', `.h') \ allwithsuffix(`hashes', `hash_modes', `.h') \ addsuffix(`cipher_modes', `-def.h') \ @@ -308,12 +398,24 @@ define(`MP_SOURCES', 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 \ - rho.c \ - GF_SOURCES PGEN_SOURCES') + mptext-len.c \ + exp.c mpcrt.c mpmul.c mprand.c \ + mpbarrett.c mpbarrett-exp.c mpbarrett-mexp.c mpbarrett-exp.h \ + mpmont.c mpmont-exp.c mpmont-mexp.c mpmont-exp.h \ + mpreduce.c mpreduce-exp.h \ + group-stdops.c group-exp.c group-exp.h g-prime.c group-parse.c \ + group-string.c group-file.c group-dstr.c \ + rho.c buf.c ptab.c \ + GF_SOURCES PGEN_SOURCES EC_SOURCES') define(`GF_SOURCES', - `gfx.c gfx-kmul.c gfx-sqr.c') + `gfx.c gfx-kmul.c gfx-sqr.c gf-arith.c gf-gcd.c \ + gfreduce.c gfreduce-exp.h') + +define(`EC_SOURCES', + `field.c field-parse.c f-prime.c f-niceprime.c f-binpoly.c \ + ec.c ec-exp.c ec-prime.c ec-bin.c ec-test.c ec-info.c ectab.c \ + ec-fetch.c g-ec.c') define(`PGEN_SOURCES', `pfilt.c rabin.c \ @@ -322,7 +424,7 @@ define(`PGEN_SOURCES', 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 \ - dh-gen.c dh-limlee.c dh-check.c dh-fetch.c \ + dh-gen.c dh-limlee.c dh-check.c dh-fetch.c dh-param.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 \ @@ -332,13 +434,17 @@ define(`PGEN_SOURCES', 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 \ + arena.c qdparse.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 \ + desx-tab.h \ + rc2-tab.h \ + skipjack-tab.h \ cast-s.c cast-sk.c cast-base.h cast-tab.h \ + rijndael-base.c rijndael-base.h \ md2-tab.h \ serpent-sbox.h skipjack-tab.h tiger-base.h \ daftstory.h \ @@ -350,19 +456,21 @@ 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 +rijndael-base.lo: rijndael-tab.h +safer.lo: safer-tab.h +mars.lo: mars-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 +patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: \ + mptypes.h primetab.h ## --- Utility programs --- bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase bin_SCRIPTS = catacomb-config xpixie noinst_PROGRAMS = \ - genprimes mptypes serpent-check \ + genprimes mptypes serpent-check bittest mpdump \ addsuffix(`gen_tables', `-mktab') LDADD = libcatacomb.la @@ -374,6 +482,8 @@ factorial_SOURCES = factorial.c pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c pixie_LDADD = mkphrase_SOURCES = mkphrase.c +bittest_SOURCES = bittest.c +bittest_LDADD = define(`emit', ` patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c @@ -389,6 +499,13 @@ genprimes_LDADD = mptypes_SOURCES = mptypes.c mptypes_LDADD = +mpdump_SOURCES = \ + mpdump.c \ + mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \ + mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \ + mptext.c mptext-string.c +mpdump_LDADD = + ## --- Install the pixie setuid-root if we can --- ## ## Bodge around a bug in Automake: it doesn't call `install-exec-hook' from @@ -397,7 +514,7 @@ mptypes_LDADD = changequote(<, >) install: install-exec-hook install-exec-hook: - @pixie="$(bindir)/`echo pixie|sed $(transform)`"; \ + @pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \ if chown root $$pixie && chmod 4755 $$pixie; then \ echo "chown root $$pixie"; \ echo "chmod 4755 $$pixie"; \ @@ -415,8 +532,12 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1 ## --- Other handy definitions --- EXTRA_DIST = \ - Makefile.m4 genmodes $(man_MANS) xpixie \ - README.cipher README.hash README.random README.mp + Makefile.m4 genmodes $(man_MANS) xpixie group-test.c \ + ectab.in ec-gentab.sh ptab.in p-gentab.sh \ + README.cipher README.hash README.random README.mp \ + debian/rules debian/copyright debian/control debian/changelog \ + debian/catacomb-bin.postinst debian/catacomb-bin.config \ + debian/catacomb-bin.prerm debian/catacomb-bin.templates dist-hook: @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true @@ -441,7 +562,7 @@ define(`CTESTRIG', $1.t)dnl $1.to: $1.c $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to -$1.t: $1.to $1.o libcatacomb.la +$1.t: $1.to libcatacomb.la $(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t') CTESTRIG(rc4) @@ -465,12 +586,26 @@ CTESTRIG(mp-sqrt) CTESTRIG(mptext) CTESTRIG(mpint) CTESTRIG(mpbarrett) +CTESTRIG(mpbarrett-exp) +CTESTRIG(mpbarrett-mexp) CTESTRIG(mpmont) +CTESTRIG(mpmont-exp) CTESTRIG(mpmont-mexp) +CTESTRIG(mpreduce) CTESTRIG(mpcrt) CTESTRIG(mpmul) CTESTRIG(gfx) +CTESTRIG(gfx-sqr) CTESTRIG(gfx-kmul) +CTESTRIG(gf-arith) +CTESTRIG(gf-gcd) +CTESTRIG(gfreduce) +CTESTRIG(ec-prime) +CTESTRIG(ec-bin) +CTESTRIG(ec-test) +CTESTRIG(ec-info) +CTESTRIG(dh-param) +CTESTRIG(group-test) CTESTRIG(pgen) CTESTRIG(dsa-gen) CTESTRIG(dsa-sign) @@ -481,17 +616,18 @@ CTESTRIG(gfshare) CTESTRIG(share) CTESTRIG(rho) -TESTS = serpent-check testprogs +TESTS = serpent-check bittest testprogs CLEANFILES = \ *.t *.to \ - mptypes.h primetab.c primetab.h \ + mptypes.h primetab.c primetab.h ectab.c \ addsuffix(`gen_tables', `-tab.h') ## --- Makefile building (haha!) --- $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4 - m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am + m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am.new + mv $(srcdir)/Makefile.am.new $(srcdir)/Makefile.am DISTCLEANFILES = libtool