X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/5ff5e6589e2b702516cb11c37e91ed69ad4eae8a..bc985cefafea2e1b02095a2ff2a9982c4c647d17:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 1be844e..ee3872a 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.64 2003/11/10 22:18:30 mdw Exp $
+## $Id: Makefile.m4,v 1.69 2004/03/23 15:19:32 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,27 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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.
 ##
@@ -266,7 +287,7 @@ 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)')
 
@@ -315,7 +336,7 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 2:1: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.
 
@@ -325,14 +346,16 @@ pkginclude_HEADERS = \
 	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 bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
-	exp.h mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
-	gfx.h \
+	exp.h mpbarrett.h mpbarrett-exp.h mpmont.h mpmont-exp.h \
+	mpcrt.h mprand.h mpmul.h \
+	gfx.h gf.h gfreduce.h gfreduce-exp.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') \
@@ -348,10 +371,13 @@ define(`MP_SOURCES',
 	mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
 	mpmont.c mpmont-mexp.c mpmont-exp.h \
 	rho.c buf.c \
-	GF_SOURCES PGEN_SOURCES')
+	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')
+
+define(`EC_SOURCES',
+	`field.c f-prime.c f-binpoly.c ec.c ec-prime.c ec-bin.c ec-test.c')
 
 define(`PGEN_SOURCES',
 	`pfilt.c rabin.c \
@@ -462,7 +488,10 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 
 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
@@ -517,7 +546,14 @@ CTESTRIG(mpmont-mexp)
 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)