## -*-m4-*-
##
-## $Id: Makefile.m4,v 1.71 2004/03/27 17:54:11 mdw Exp $
+## $Id: Makefile.m4,v 1.77 2004/04/01 21:28:41 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## Revision 1.77 2004/04/01 21:28:41 mdw
+## Normal basis support (translates to poly basis internally). Rewrite
+## EC and prime group table generators in awk, so that they can reuse data
+## for repeated constants.
+##
+## Revision 1.76 2004/04/01 12:59:40 mdw
+## Ooops! qdparse needs mp headers.
+##
+## 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.
##
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.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
+ectab.c: ectab.in ec-gentab.awk mpdump
+ $(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
mv ectab.c.new ectab.c
+ptab.c: ptab.in p-gentab.awk mpdump
+ $(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
+ mv ptab.c.new ptab.c
+
BUILT_SOURCES = \
getdate.c modes-stamp \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
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 \
+ gfx.h gf.h gfreduce.h gfn.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 \
+ 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') \
addsuffix(`hash_modes', `-def.h') crc32.h
define(`MP_SOURCES',
- `mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
+ `mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c qdparse.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 \
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 \
+ 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 \
- rho.c buf.c \
+ 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 gf-arith.c gf-gcd.c \
- gfreduce.c gfreduce-exp.h ')
+ gfreduce.c gfreduce-exp.h gfn.c')
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')
+ 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 \
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 \
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 qdparse.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 \
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 ---
## --- Other handy definitions ---
EXTRA_DIST = \
- Makefile.m4 genmodes $(man_MANS) xpixie \
+ Makefile.m4 genmodes $(man_MANS) xpixie group-test.c \
+ ectab.in ec-gentab.awk ptab.in p-gentab.awk \
README.cipher README.hash README.random README.mp \
debian/rules debian/copyright debian/control debian/changelog \
debian/catacomb-bin.postinst debian/catacomb-bin.config \
$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)
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(gf-arith)
CTESTRIG(gf-gcd)
CTESTRIG(gfreduce)
+CTESTRIG(gfn)
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)
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!) ---