Add binary poly arithmetic. Tidy table generation stuff. Distribute

calc prototypes.

diff --git a/Makefile.m4 b/Makefile.m4
index f623a70..69790bc 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.42 2000/10/08 12:16:06 mdw Exp $
+## $Id: Makefile.m4,v 1.43 2000/10/08 16:01:26 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.43  2000/10/08 16:01:26  mdw
+## Add binary poly arithmetic.  Tidy table generation stuff.  Distribute
+## calc prototypes.
+##
 ## Revision 1.42  2000/10/08 12:16:06  mdw
 ## Remove vestiges of @primorial@.
 ##
@@ -216,7 +220,7 @@ modes-stamp: genmodes
 
 define(`gen_tables', `dnl
 _(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
-_(gfshare)')
+_(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
@@ -254,6 +258,7 @@ pkginclude_HEADERS = \
        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 \
+       gfx.h \
        primetab.h pfilt.h rabin.h \
        pgen.h prim.h strongprime.h limlee.h \
        bbs.h rsa.h dh.h dsarand.h dsa.h \
@@ -272,7 +277,10 @@ define(`MP_SOURCES',
        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 \
        rho.c \
-       PGEN_SOURCES')
+       GF_SOURCES PGEN_SOURCES')
+
+define(`GF_SOURCES',
+       `gfx.c gfx-kmul.c gfx-sqr.c')
 
 define(`PGEN_SOURCES',
        `pfilt.c rabin.c \
@@ -294,7 +302,7 @@ libcatacomb_la_SOURCES = \
        passphrase.c pixie-client.c pixie-common.c lmem.c \
        oaep.c pkcs1.c pss.c \
        gfshare.c \
-       MP_SOURCES mpx-kmac.h \
+       MP_SOURCES karatsuba.h \
        des-base.c des-base.h \
        cast-s.c cast-sk.c cast-base.h cast-tab.h \
        serpent-sbox.h skipjack-tab.h tiger-base.h \
@@ -310,6 +318,7 @@ square.lo: square-tab.h
 rijndael.lo: rijndael-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
+gfx-sqr.lo: gfx-sqr-tab.h
 patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: mptypes.h
 patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
 
@@ -318,10 +327,8 @@ 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 \
-       des-mktab blowfish-mktab twofish-mktab square-mktab rijndael-mktab \
-       tiger-mktab serpent-check \
-       gfshare-mktab
+       genprimes mptypes serpent-check \
+       addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la
 
 dsig_SOURCES = dsig.c getdate.y getdate.h
@@ -333,22 +340,13 @@ pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
 
-des_mktab_SOURCES = des-mktab.c
-des_mktab_LDADD =
-blowfish_mktab_SOURCES = blowfish-mktab.c
-blowfish_mktab_LDADD =
-twofish_mktab_SOURCES = twofish-mktab.c
-twofish_mktab_LDADD =
-square_mktab_SOURCES = square-mktab.c
-square_mktab_LDADD =
-rijndael_mktab_SOURCES = rijndael-mktab.c
-rijndael_mktab_LDADD =
+define(`emit', `
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c
+patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_LDADD =')dnl
+gen_tables
+
 serpent_check_SOURCES = serpent-check.c
 serpent_check_LDADD =
-gfshare_mktab_SOURCES = gfshare-mktab.c
-gfshare_mktab_LDADD =
-tiger_mktab_SOURCES = tiger-mktab.c
-tiger_mktab_LDADD =
 
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
@@ -388,9 +386,10 @@ EXTRA_DIST = \
 dist-hook:
        @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
        @echo datestamp >$(distdir)/modes-stamp || true
-       @mkdir $(distdir)/tests || true
-       @ln $(srcdir)/tests/* $(distdir)/tests || true
-       @rm -f $(distdir)/tests/*~
+       @for i in calc tests; do \
+         mkdir $(distdir)/$$i; \
+         ln $(srcdir)/$$i/*[!~] $(distdir)/$$i; \
+       done || true
 #      kr=$$HOME/.catacomb/dsig-keyring; \
 #      if [ -r $$kr ]; then \
 #        cd $(distdir); \
@@ -433,6 +432,8 @@ CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
 CTESTRIG(mpmul)
+CTESTRIG(gfx)
+CTESTRIG(gfx-kmul)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)