X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/2e8eb64a72472bea4faba1cee5edde4fe3616808..f13d5013f6ca3c4d839e668ff60127e332d29cb0:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index cb60ae6..bd4be03 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.54 2001/05/07 17:32:52 mdw Exp $
+## $Id: Makefile.m4,v 1.58 2002/10/19 17:56:50 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,18 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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.
 ##
@@ -231,7 +243,7 @@ _(rc2) _(rc5) dnl
 _(skipjack) dnl
 _(cast128) _(cast256) dnl
 _(square) _(rijndael) _(rijndael192) _(rijndael256) dnl
-_(serpent)')
+_(serpent) _(noekeon)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
@@ -292,8 +304,8 @@ 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 \
-	mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.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 \
 	primetab.h pfilt.h rabin.h \
 	pgen.h prim.h strongprime.h limlee.h keycheck.h \
@@ -311,7 +323,10 @@ 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 \
+	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')
 
@@ -368,7 +383,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
 
@@ -380,6 +395,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
@@ -471,6 +488,7 @@ CTESTRIG(mp-sqrt)
 CTESTRIG(mptext)
 CTESTRIG(mpint)
 CTESTRIG(mpbarrett)
+CTESTRIG(mpbarrett-mexp)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
@@ -487,7 +505,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t *.to \