X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/aacf9080e9b71193dc87095108366a85a62334e3..ceb3f0c0a3b7bb3fa3250d31b04c382894095e52:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 19c6eba..4a95044 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.56 2001/06/16 13:01:10 mdw Exp $
+## $Id: Makefile.m4,v 1.60.2.2 2004/03/21 22:39:46 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,24 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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.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.
 ##
@@ -289,7 +307,7 @@ 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.
 
@@ -298,15 +316,17 @@ pkginclude_HEADERS = \
 	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 \
-	exp.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 mpbarrett-exp.h mpmont.h mpmont-exp.h \
+	mpcrt.h mprand.h mpmul.h \
+	gfx.h gf.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 \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.h') \
@@ -317,14 +337,18 @@ 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 \
+	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 \
 	rho.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')
 
 define(`PGEN_SOURCES',
 	`pfilt.c rabin.c \
@@ -349,6 +373,9 @@ libcatacomb_la_SOURCES = \
 	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 \
@@ -376,7 +403,7 @@ patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.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 \
 	addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la
 
@@ -388,6 +415,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
@@ -411,7 +440,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"; \
@@ -485,7 +514,13 @@ 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(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
@@ -496,7 +531,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t *.to \