Add DSA files and tests.

diff --git a/Makefile.m4 b/Makefile.m4
index c0f3f54..cb65285 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.9 1999/11/17 18:05:35 mdw Exp $
+## $Id: Makefile.m4,v 1.10 1999/11/19 19:28:24 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,11 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.9  1999/11/17 18:05:35  mdw
-## Many new files and test cases for multiprecision arithmetic.
+## Revision 1.10  1999/11/19 19:28:24  mdw
+## Add DSA files and tests.
+##
+## Revision 1.10  1999/11/19 19:28:24  mdw
+## Add DSA files and tests.
 ##
 ## Revision 1.9  1999/11/17 18:05:35  mdw
 ## Many new files and test cases for multiprecision arithmetic.
@@ -99,8 +102,11 @@ MODES = \
        adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
 
 $(MODES): $(srcdir)/genmodes
-$(srcdir)/des_sp.h: des-mktab
-       ./des-mktab >$(srcdir)/des_sp.h
+       cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')"
+       cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
+
+des_sp.h: des-mktab
+       ./des-mktab >des_sp.h
 
 ptab.c ptab.h: genprimes
        ./genprimes -h ptab.h -c ptab.c -m 256 -t "unsigned char" -i ptab
@@ -108,7 +114,6 @@ ptab.c ptab.h: genprimes
 archinclude_HEADERS = mptypes.h
 
 mptypes.h: mptypes
-       des_sp.h \
        ./mptypes >mptypes.h
 
 BUILT_SOURCES = \
@@ -131,6 +136,8 @@ pkginclude_HEADERS = \
        paranoia.h \
        blkc.h hash.h \
        rc4.h \
+       rand.h noise.h \
+       dsa.h \
        mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
        ptab.h pgen.h rabin.h \
        dsa.h dh.h \
@@ -144,7 +151,9 @@ libcatacomb_la_SOURCES = \
        rand.c noise.c \
        key.c \
        mpx.c mpscan.c mparena.c \
-       mpmont.c \
+       mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
+       mp-gcd.c \
+       mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
        ptab.c pgen.c rabin.c \
        dsa-sign.c dsa-verify.c dsa-gen.c \
        dh-prime.c \
@@ -155,7 +164,7 @@ des-base.lo: des_sp.h
 mpx.lo: mptypes.h
 
 ## --- Utility programs ---
-noinst_PROGRAMS = des-mktab mptypes
+
 bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
 noinst_PROGRAMS = des-mktab genprimes mptypes
@@ -163,6 +172,9 @@ LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+des_mktab_SOURCES = des-mktab.c
+des_mktab_LDADD =
+
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
@@ -191,20 +203,24 @@ define(`CTESTRIG',
 `define(`testprogs', testprogs \
        $1.t)dnl
 $1.t: $1.c libcatacomb.la
+       $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c .libs/libcatacomb.a $(LIBS) -o $1.t')
+
+CTESTRIG(rc4)
+adorn(`nl`'CTESTRIG(', `ciphers', `)')
 CTESTRIG(mpx-test)
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(mpx)
 CTESTRIG(mptext)
-
-adorn(`nl`'CTESTRIG(', `ciphers', `)')
-adorn(`nl`'CTESTRIG(', `hashes', `)')
-adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
-adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
+CTESTRIG(mp-arith)
+CTESTRIG(mp-gcd)
+CTESTRIG(mpmont)
+CTESTRIG(mpmont-mexp)
+CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
-CLEANFILES = *.t mptypes.h
+
 TESTS = testprogs
 
 CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
@@ -213,8 +229,8 @@ CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
        m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
-       $(MODES) $(srcdir)/des_sp.h \
-       $(srcdir)/getdate.c getdate.c
+
+MAINTAINERCLEANFILES = \
        $(srcdir)/Makefile.am \
        $(srcdir)/getdate.c getdate.c \
        $(MODES)