X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c61ee18cea55601bfe24e88dbb3a4ddf43fd6844..67a452f7a9d69723741b064f08d70462bc8f00e7:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index fccb60d..5d5420a 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -90,7 +90,8 @@ _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
 autoheaders: \
-  addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h mplimits.h
+  addsuffix(`gen_tables', `-tab.h') \
+  primetab.h wheel.h mptypes.h mplimits.h
 define(`emit', `
 _item`'-tab.h: _item`'-mktab$(EXEEXT)
 	./_item`'-mktab >_item`'-tab.h.new
@@ -102,6 +103,13 @@ primetab.c: genprimes$(EXEEXT)
 	./genprimes -h primetab.h -c primetab.c \
 		-s CATACOMB_PRIMETAB_H -n 256 \
 		-t "unsigned short" -i primetab
+
+wheel.h: wheel.c
+wheel.c: genwheel$(EXEEXT)
+	./genwheel -h wheel.h -c wheel.c \
+		-s CATACOMB_WHEEL_H -n 5
+		-t "unsigned char" -i wheel
+
 archinclude_HEADERS = mptypes.h mplimits.h
 mptypes.h: mptypes$(EXEEXT)
 	./mptypes >mptypes.h.new
@@ -168,8 +176,8 @@ pkginclude_HEADERS = \
 	exp.h mpbarrett.h mpmont.h mpreduce.h mp-exp.h \
 	mpcrt.h mprand.h mpmul.h \
 	gfx.h gf.h gfreduce.h gfn.h gf-exp.h \
-	primetab.h pfilt.h rabin.h \
-	pgen.h prim.h strongprime.h limlee.h keycheck.h \
+	primetab.h wheel.h pfilt.h rabin.h \
+	pgen.h primeiter.h prim.h strongprime.h limlee.h keycheck.h \
 	bbs.h rsa.h dh.h dsarand.h dsa.h gdsa.h gkcdsa.h \
 	tlsprf.h sslprf.h \
 	gfshare.h share.h \
@@ -214,7 +222,7 @@ define(`EC_SOURCES',
 	ec-fetch.c ec-raw.c g-ec.c')
 
 define(`PGEN_SOURCES',
-	`pfilt.c rabin.c \
+	`pfilt.c primeiter.c rabin.c \
 	pgen.c pgen-stdev.c pgen-gcd.c pgen-simul.c \
 	  prim.c strongprime.c limlee.c \
 	keycheck.c keycheck-mp.c keycheck-report.c \
@@ -227,10 +235,10 @@ define(`PGEN_SOURCES',
 	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 \
-	primetab.c share.c')
+	primetab.c wheel.c share.c')
 
 libcatacomb_la_SOURCES = \
-	grand.c keysz.c \
+	grand.c keysz.c keysz-conv.c \
 	lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
 	arena.c \
 	passphrase.c pixie-common.c lmem.c \
@@ -271,7 +279,7 @@ bin_PROGRAMS = \
 noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
-	genprimes mptypes genlimits serpent-check bittest mpdump \
+	genprimes genwheel mptypes genlimits serpent-check bittest mpdump \
 	perftest \
 	addsuffix(`gen_tables', `-mktab')
 LDADD = libcatcrypt.a libcatacomb.la
@@ -282,7 +290,7 @@ libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
 
 patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
 	patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
-	mptypes.h primetab.h
+	mptypes.h primetab.h wheel.h
 patsubst(MP_SOURCES, `\.c\>', `.lo'): mplimits.h
 
 dsig_SOURCES = dsig.c
@@ -312,10 +320,13 @@ serpent_check_LDADD =
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
+genwheel_SOURCES = genwheel.c
+genwheel_LDADD =
+
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
-genlimits_SOURCES = genlimits.c MP_BASE
+genlimits_SOURCES = genlimits.c MP_BASE mptypes.h
 genlimits_LDADD =
 genlimits_CFLAGS = $(AM_CFLAGS)
 
@@ -442,6 +453,7 @@ CTESTRIG(group-test)
 CTESTRIG(gdsa)
 CTESTRIG(gkcdsa)
 CTESTRIG(pgen)
+CTESTRIG(primeiter)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
@@ -455,7 +467,8 @@ TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t$(EXEEXT) *.to *.kr.old \
-	mptypes.h primetab.c primetab.h ectab.c ptab.c bintab.c \
+	mptypes.h primetab.c primetab.h wheel.c wheel.h \
+	ectab.c ptab.c bintab.c \
 	addsuffix(`gen_tables', `-tab.h')
 
 ## --- Makefile building (haha!) ---