Lots of new files.

diff --git a/Makefile.m4 b/Makefile.m4
index 8cf9edc..3ad34ec 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.17 1999/11/25 11:38:31 mdw Exp $
+## $Id: Makefile.m4,v 1.18 1999/12/10 23:30:01 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.18  1999/12/10 23:30:01  mdw
+## Lots of new files.
+##
 ## Revision 1.17  1999/11/25 11:38:31  mdw
 ## Support for conversions between MPs and C integers.
 ##
@@ -143,7 +146,7 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 0:4:0
+libcatacomb_la_LDFLAGS = -version-info 0:5:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -151,30 +154,40 @@ define(`emit', `$1.h ')
 pkginclude_HEADERS = \
        paranoia.h \
        blkc.h hash.h \
+       gcipher.h ghash.h gmac.h grand.c \
+       ghash-def.h \
        rc4.h \
        rand.h noise.h \
        key.h \
+       lcrand.h fibrand.h \
        mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
-       mpmont.h mpcrt.h \
+       mpbarrett.h mpmont.h mpcrt.h \
+       mprand.h \
        ptab.h pgen.h rabin.h \
-       dsa.h dh.h \
+       bbs.h dsa.h dh.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
-       allwithsuffix(`hashes', `hash_modes', `.h')
+       allwithsuffix(`hashes', `hash_modes', `.h') \
+       addsuffix(`cipher_modes', `-def.h') \
+       addsuffix(`hash_modes', `-def.h')
 
 define(`emit', `$1.c ')
 libcatacomb_la_SOURCES = \
+       grand.c \
        des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
        rc4.c \
        rand.c noise.c \
        key.c \
-       mpx.c mpscan.c mparena.c \
+       lcrand.c fibrand.c \
+       mpx.c mpx-kmul.c 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 \
        mpint.c \
        mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
-       mpmont.c mpmont-mexp.c \
+       mpbarrett.c mpmont.c mpmont-mexp.c \
        mpcrt.c \
+       mprand.c \
        ptab.c pgen.c rabin.c \
+       bbs-rand.c bbs-gen.c bbs-jump.c \
        dsa-sign.c dsa-verify.c dsa-gen.c \
        dh-prime.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
@@ -188,11 +201,13 @@ mpx.lo: mptypes.h
 
 bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
-noinst_PROGRAMS = des-mktab genprimes mptypes
+noinst_PROGRAMS = des-mktab genprimes mptypes rspit
 LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+rspit_SOURCES = rspit.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 
@@ -225,7 +240,7 @@ define(`CTESTRIG',
        $1.t)dnl
 $1.to: $1.c
        $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
-$1.t: $1.to libcatacomb.la
+$1.t: $1.to $1.o libcatacomb.la
        $(CC) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
 
 CTESTRIG(rc4)
@@ -233,12 +248,15 @@ adorn(`nl`'CTESTRIG(', `ciphers', `)')
 adorn(`nl`'CTESTRIG(', `hashes', `)')
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
+CTESTRIG(lcrand)
 CTESTRIG(mpx)
-CTESTRIG(mptext)
+CTESTRIG(mpx-kmul)
 CTESTRIG(mp-arith)
 CTESTRIG(mp-gcd)
 CTESTRIG(mp-jacobi)
+CTESTRIG(mptext)
 CTESTRIG(mpint)
+CTESTRIG(mpbarrett)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
@@ -246,6 +264,8 @@ CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
+CTESTRIG(bbs-rand)
+CTESTRIG(bbs-jump)
 
 TESTS = testprogs