X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e7dc130f304bb10854e4b38488fabd258c99dcab..75263f25a1ce8e7b38ad4bd61a9a893723ec1db3:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index d1d55cd..bd4be03 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.51 2001/04/19 18:26:32 mdw Exp $
+## $Id: Makefile.m4,v 1.58 2002/10/19 17:56:50 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,27 @@
 ##----- 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.
+##
+## Revision 1.53  2001/04/29 18:11:19  mdw
+## New block cipher MARS.
+##
+## Revision 1.52  2001/04/29 17:37:35  mdw
+## Added SAFER block cipher.
+##
 ## Revision 1.51  2001/04/19 18:26:32  mdw
 ## Add CRC as another hash function.
 ##
@@ -214,15 +235,15 @@ addsuffix(join(`$1', `-', `$2'), `$3')')
 ## --- Autogenerated source files ---
 
 define(`ciphers', `dnl
-_(des) _(desx) _(des3) dnl
-_(idea) dnl
+_(des) _(desx) _(des3) _(mars) dnl
+_(idea) _(safer) _(safersk) dnl
 _(blowfish) _(twofish) dnl
 _(tea) _(xtea) dnl
 _(rc2) _(rc5) dnl
 _(skipjack) dnl
 _(cast128) _(cast256) dnl
-_(square) _(rijndael) dnl
-_(serpent)')
+_(square) _(rijndael) _(rijndael192) _(rijndael256) dnl
+_(serpent) _(noekeon)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
@@ -244,7 +265,9 @@ modes-stamp: genmodes
 	echo datestamp >modes-stamp
 
 define(`gen_tables', `dnl
-_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
+_(des) _(blowfish) _(twofish) dnl
+_(square) _(rijndael) dnl
+_(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
@@ -262,7 +285,7 @@ mptypes.h: mptypes
 	./mptypes >mptypes.h
 
 BUILT_SOURCES = \
-	getdate.c \
+	getdate.c modes-stamp \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
@@ -281,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 \
@@ -300,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')
 
@@ -331,6 +357,7 @@ libcatacomb_la_SOURCES = \
 	MP_SOURCES karatsuba.h \
 	des-base.c des-base.h \
 	cast-s.c cast-sk.c cast-base.h cast-tab.h \
+	rijndael-base.c rijndael-base.h \
 	md2-tab.h \
 	serpent-sbox.h skipjack-tab.h tiger-base.h \
 	daftstory.h \
@@ -342,7 +369,9 @@ des-base.lo: des-tab.h
 blowfish.lo: blowfish-tab.h
 twofish.lo: twofish-tab.h
 square.lo: square-tab.h
-rijndael.lo: rijndael-tab.h
+rijndael-base.lo: rijndael-tab.h
+safer.lo: safer-tab.h
+mars.lo: mars-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
 gfx-sqr.lo: gfx-sqr-tab.h
@@ -354,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
 
@@ -366,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
@@ -457,6 +488,7 @@ CTESTRIG(mp-sqrt)
 CTESTRIG(mptext)
 CTESTRIG(mpint)
 CTESTRIG(mpbarrett)
+CTESTRIG(mpbarrett-mexp)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
@@ -473,7 +505,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t *.to \