New hash functions and other stuff.

diff --git a/.cvsignore b/.cvsignore
index b60e8f7..078075e 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -108,10 +108,22 @@ rijndael-ecb.c
 rijndael-ecb.h
 rijndael-ofb.c
 rijndael-ofb.h
+rmd128-hmac.c
+rmd128-hmac.h
+rmd128-mgf.c
+rmd128-mgf.h
 rmd160-hmac.c
 rmd160-hmac.h
 rmd160-mgf.c
 rmd160-mgf.h
+rmd256-hmac.c
+rmd256-hmac.h
+rmd256-mgf.c
+rmd256-mgf.h
+rmd320-hmac.c
+rmd320-hmac.h
+rmd320-mgf.c
+rmd320-mgf.h
 serpent-cbc.c
 serpent-cbc.h
 serpent-cfb.c

diff --git a/Makefile.m4 b/Makefile.m4
index f46c53c..6026b58 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.32 2000/07/01 11:27:32 mdw Exp $
+## $Id: Makefile.m4,v 1.33 2000/07/09 21:34:15 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.33  2000/07/09 21:34:15  mdw
+## New hash functions and other stuff.
+##
 ## Revision 1.32  2000/07/01 11:27:32  mdw
 ## Name changes and new files.
 ##
@@ -160,7 +163,9 @@ _(rijndael) dnl
 _(serpent)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
-define(`hashes', `_(md5) _(md4) _(rmd160) _(sha)')
+define(`hashes', `dnl
+_(md5) _(md4) _(sha) dnl
+_(rmd128) _(rmd160) _(rmd256) _(rmd320)')
 define(`hash_modes', `_(mgf) _(hmac)')
 
 MODES = \
@@ -227,10 +232,11 @@ pkginclude_HEADERS = \
        mpbarrett.h mpmont.h mpcrt.h \
        mprand.h mpmul.h \
        primetab.h pfilt.h primorial.h rabin.h \
-       pgen.h prim.h strongprime.h \
+       pgen.h prim.h strongprime.h limlee.h \
        bbs.h rsa.h dh.h dsarand.h dsa.h \
        oaep.h pkcs1.h \
        gfshare.h share.h \
+       rho.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
        allwithsuffix(`hashes', `hash_modes', `.h') \
        addsuffix(`cipher_modes', `-def.h') \
@@ -257,12 +263,14 @@ libcatacomb_la_SOURCES = \
        mprand.c \
        primetab.c pfilt.c rabin.c primorial.c \
        pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
+       limlee.c \
        bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
        rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
        oaep.c pkcs1.c \
        dh-gen.c dh-fetch.c \
        dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.c \
        gfshare.c share.c \
+       rho.c \
        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 \
@@ -279,7 +287,7 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit
+bin_PROGRAMS = dsig key pixie rspit factorial
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
        genprimes mptypes \
@@ -296,6 +304,8 @@ pixie_LDADD =
 
 rspit_SOURCES = rspit.c
 
+factorial_SOURCES = factorial.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 
@@ -390,6 +400,7 @@ CTESTRIG(mpbarrett)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)
+CTESTRIG(mpmul)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
@@ -398,6 +409,7 @@ CTESTRIG(bbs-rand)
 CTESTRIG(bbs-jump)
 CTESTRIG(gfshare)
 CTESTRIG(share)
+CTESTRIG(rho)
 
 TESTS = testprogs