More hashes and ciphers. An extra tool.

diff --git a/Makefile.m4 b/Makefile.m4
index 6026b58..3a7c02a 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.33 2000/07/09 21:34:15 mdw Exp $
+## $Id: Makefile.m4,v 1.34 2000/07/15 20:55:32 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.34  2000/07/15 20:55:32  mdw
+## More hashes and ciphers.  An extra tool.
+##
 ## Revision 1.33  2000/07/09 21:34:15  mdw
 ## New hash functions and other stuff.
 ##
@@ -157,14 +160,16 @@ define(`ciphers', `dnl
 _(des) _(des3) dnl
 _(idea) dnl
 _(blowfish) _(twofish) dnl
+_(tea) _(xtea) dnl
 _(rc2) _(rc5) dnl
+_(skipjack) dnl
 _(cast128) _(cast256) dnl
-_(rijndael) dnl
+_(square) _(rijndael) dnl
 _(serpent)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
-_(md5) _(md4) _(sha) dnl
+_(md5) _(md4) _(sha) _(tiger) dnl
 _(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
 
@@ -180,23 +185,23 @@ $(MODES):
 
 des-tab.h: des-mktab
        ./des-mktab >des-tab.h
-
 blowfish-tab.h: blowfish-mktab
        ./blowfish-mktab >blowfish-tab.h
-
 twofish-tab.h: twofish-mktab
        ./twofish-mktab >twofish-tab.h
-
+square-tab.h: square-mktab
+       ./square-mktab >square-tab.h
 rijndael-tab.h: rijndael-mktab
        ./rijndael-mktab >rijndael-tab.h
+tiger-tab.h: tiger-mktab
+       ./tiger-mktab >tiger-tab.h
+gfshare-tab.h: gfshare-mktab
+       ./gfshare-mktab >gfshare-tab.h
 
 primetab.c primetab.h: genprimes
        ./genprimes -h primetab.h -c primetab.c -m 255 \
                -t "unsigned char" -i primetab
 
-gfshare-tab.h: gfshare-mktab
-       ./gfshare-mktab >gfshare-tab.h
-
 archinclude_HEADERS = mptypes.h
 
 mptypes.h: mptypes
@@ -282,47 +287,46 @@ libcatacomb_la_SOURCES = \
 des-base.lo: des-tab.h
 blowfish.lo: blowfish-tab.h
 twofish.lo: twofish-tab.h
+square.lo: square-tab.h
 rijndael.lo: rijndael-tab.h
+tiger.lo: tiger-tab.h
 mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit factorial
+bin_PROGRAMS = dsig key pixie rspit factorial hashsum
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
        genprimes mptypes \
-       des-mktab blowfish-mktab twofish-mktab rijndael-mktab serpent-check \
+       des-mktab blowfish-mktab twofish-mktab square-mktab rijndael-mktab \
+       tiger-mktab serpent-check \
        gfshare-mktab
 LDADD = libcatacomb.la
 
 dsig_SOURCES = dsig.c getdate.y getdate.h
-
 key_SOURCES = keyutil.c getdate.y getdate.h
-
-pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
-pixie_LDADD =
-
+hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
-
 factorial_SOURCES = factorial.c
+pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
+pixie_LDADD =
 
 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 =
-
 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 =
@@ -386,6 +390,7 @@ adorn(`nl`'CTESTRIG(', `hashes', `)')
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(lcrand)
+CTESTRIG(oaep)
 CTESTRIG(mpx)
 CTESTRIG(mpx-kmul)
 CTESTRIG(mpx-ksqr)
@@ -411,7 +416,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = testprogs
+TESTS = serpent-check testprogs
 
 CLEANFILES = \
        *.t *.to \