X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/df9ed0a16b33271c96f90e3901aaacdf951dde2d..817d0432ed9d011d644332ba3d818609e2e62312:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 6cee1b2..6026b58 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.27 2000/06/17 13:28:50 mdw Exp $
+## $Id: Makefile.m4,v 1.33 2000/07/09 21:34:15 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,25 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.33  2000/07/09 21:34:15  mdw
+## New hash functions and other stuff.
+##
+## Revision 1.32  2000/07/01 11:27:32  mdw
+## Name changes and new files.
+##
+## Revision 1.31  2000/06/25 13:02:07  mdw
+## Fix cleaning of generated files.
+##
+## Revision 1.30  2000/06/22 19:10:33  mdw
+## Fix Makefile to test mp-sqrt.c.
+##
+## Revision 1.29  2000/06/22 19:04:19  mdw
+## More new functions to be added.
+##
+## Revision 1.28  2000/06/18 23:31:18  mdw
+## Rearrange build order to ensure that `mptypes.h' exists by the time it's
+## needed.
+##
 ## Revision 1.27  2000/06/17 13:28:50  mdw
 ## Minor tidying and fixing.
 ##
@@ -144,7 +163,9 @@ _(rijndael) dnl
 _(serpent)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
-define(`hashes', `_(md5) _(md4) _(rmd160) _(sha)')
+define(`hashes', `dnl
+_(md5) _(md4) _(sha) dnl
+_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
 
 MODES = \
@@ -209,11 +230,13 @@ pkginclude_HEADERS = \
 	lcrand.h fibrand.h \
 	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
 	mpbarrett.h mpmont.h mpcrt.h \
-	mprand.h \
+	mprand.h mpmul.h \
 	primetab.h pfilt.h primorial.h rabin.h \
-	pgen.h prim.h strongprime.h \
+	pgen.h prim.h strongprime.h limlee.h \
 	bbs.h rsa.h dh.h dsarand.h dsa.h \
+	oaep.h pkcs1.h \
 	gfshare.h share.h \
+	rho.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.h') \
@@ -228,27 +251,30 @@ libcatacomb_la_SOURCES = \
 	rc4.c seal.c \
 	rand.c noise.c fipstest.c maurer.c \
 	arena.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 key-error.c \
-		key-fetch.c \
 	passphrase.c pixie-client.c pixie-common.c lmem.c \
 	lcrand.c fibrand.c \
 	mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h mpscan.c mparena.c \
 	mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
-	mp-gcd.c mp-jacobi.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 \
+	mpcrt.c mpmul.c \
 	mprand.c \
 	primetab.c pfilt.c rabin.c primorial.c \
 	pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
+	limlee.c \
 	bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
-	rsa-decrypt.c rsa-gen.c rsa-recover.c rsa-fetch.c \
+	rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
+	oaep.c pkcs1.c \
 	dh-gen.c dh-fetch.c \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.c \
 	gfshare.c share.c \
+	rho.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 key-error.c \
+		key-fetch.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
@@ -261,7 +287,7 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit
+bin_PROGRAMS = dsig key pixie rspit factorial
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
 	genprimes mptypes \
@@ -278,6 +304,8 @@ pixie_LDADD =
 
 rspit_SOURCES = rspit.c
 
+factorial_SOURCES = factorial.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 
@@ -362,14 +390,17 @@ CTESTRIG(mpx)
 CTESTRIG(mpx-kmul)
 CTESTRIG(mpx-ksqr)
 CTESTRIG(mp-arith)
+CTESTRIG(mp-modsqrt)
 CTESTRIG(mp-gcd)
 CTESTRIG(mp-jacobi)
+CTESTRIG(mp-sqrt)
 CTESTRIG(mptext)
 CTESTRIG(mpint)
 CTESTRIG(mpbarrett)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
+CTESTRIG(mpmul)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
@@ -378,13 +409,14 @@ CTESTRIG(bbs-rand)
 CTESTRIG(bbs-jump)
 CTESTRIG(gfshare)
 CTESTRIG(share)
+CTESTRIG(rho)
 
 TESTS = testprogs
 
 CLEANFILES = \
 	*.t *.to \
 	mptypes.h primetab.c primetab.h \
-	des-sp.h twofish-tab.h blowfish-tab.h
+	des-tab.h twofish-tab.h blowfish-tab.h gfshare-tab.h rijndael-tab.h
 
 ## --- Makefile building (haha!) ---