-## -*-makefile-*-
+## -*-m4-*-
##
-## $Id: Makefile.m4,v 1.54 2001/05/07 17:32:52 mdw Exp $
+## $Id: Makefile.m4,v 1.71 2004/03/27 17:54:11 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## 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.
##
_(skipjack) dnl
_(cast128) _(cast256) dnl
_(square) _(rijndael) _(rijndael192) _(rijndael256) dnl
-_(serpent)')
+_(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)')
autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
define(`emit', `
_item`'-tab.h: _item`'-mktab
- ./_item`'-mktab >_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
-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
BUILT_SOURCES = \
getdate.c modes-stamp \
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 \
allwithsuffix(`ciphers', `cipher_modes', `.h') \
allwithsuffix(`hashes', `hash_modes', `.h') \
addsuffix(`cipher_modes', `-def.h') \
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-mexp.c mpbarrett-exp.h \
+ mpmont.c mpmont-mexp.c mpmont-exp.h \
+ mpreduce.c mpreduce-exp.h \
+ rho.c buf.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-prime.c ec-bin.c ec-test.c ec-info.c ectab.c')
define(`PGEN_SOURCES',
`pfilt.c rabin.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 \
+ 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 \
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
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
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
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"; \
EXTRA_DIST = \
Makefile.m4 genmodes $(man_MANS) xpixie \
- README.cipher README.hash README.random README.mp
+ 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
CTESTRIG(mptext)
CTESTRIG(mpint)
CTESTRIG(mpbarrett)
+CTESTRIG(mpbarrett-mexp)
CTESTRIG(mpmont)
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(pgen)
CTESTRIG(dsa-gen)
CTESTRIG(dsa-sign)
CTESTRIG(share)
CTESTRIG(rho)
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
CLEANFILES = \
*.t *.to \
## --- 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
projects / u / mdw / catacomb / blobdiff