From cc44d54e791d4237a81d35353d21f81f3f19c870 Mon Sep 17 00:00:00 2001 From: mdw Date: Sat, 17 Jun 2000 10:33:43 +0000 Subject: [PATCH] Lots of new ciphers and other files. --- Makefile.m4 | 123 +++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 96 insertions(+), 27 deletions(-) diff --git a/Makefile.m4 b/Makefile.m4 index 15ed97f..34528fb 100644 --- a/Makefile.m4 +++ b/Makefile.m4 @@ -1,6 +1,6 @@ ## -*-makefile-*- ## -## $Id: Makefile.m4,v 1.25 2000/02/12 18:55:40 mdw Exp $ +## $Id: Makefile.m4,v 1.26 2000/06/17 10:33:43 mdw Exp $ ## ## Makefile for Catacomb ## @@ -29,6 +29,9 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.m4,v $ +## Revision 1.26 2000/06/17 10:33:43 mdw +## Lots of new ciphers and other files. +## ## Revision 1.25 2000/02/12 18:55:40 mdw ## Make it all compile properly. ## @@ -104,6 +107,8 @@ AUTOMAKE_OPTIONS = foreign +SUBDIRS = tests + archincludedir = $(libdir)/catacomb/include ## --- List handling macros --- @@ -126,11 +131,18 @@ addsuffix(join(`$1', `-', `$2'), `$3')') ## --- Autogenerated source files --- -define(`ciphers', `_(des) _(des3) _(blowfish) _(idea) _(rc5)') -define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb)') +define(`ciphers', `dnl +_(des) _(des3) dnl +_(idea) dnl +_(blowfish) _(twofish) dnl +_(rc2) _(rc5) dnl +_(cast128) _(cast256) dnl +_(rijndael) dnl +_(serpent)') +define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)') define(`hashes', `_(md5) _(md4) _(rmd160) _(sha)') -define(`hash_modes', `_(hmac)') +define(`hash_modes', `_(mgf) _(hmac)') MODES = \ adorn(`$(srcdir)/', join(`ciphers', `-', `cipher_modes'), `.c') \ @@ -138,15 +150,28 @@ MODES = \ adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.c') \ adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h') -$(MODES): $(srcdir)/genmodes +$(MODES): 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 +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 + +rijndael-tab.h: rijndael-mktab + ./rijndael-mktab >rijndael-tab.h primetab.c primetab.h: genprimes - ./genprimes -h primetab.h -c primetab.c -m 255 -t "unsigned char" -i primetab + ./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 @@ -155,6 +180,8 @@ mptypes.h: mptypes BUILT_SOURCES = \ getdate.c \ + des-tab.h blowfish-tab.h twofish-tab.h rijndael-tab.h \ + gfshare-tab.h \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ @@ -164,18 +191,18 @@ BUILT_SOURCES = \ lib_LTLIBRARIES = libcatacomb.la -libcatacomb_la_LDFLAGS = -version-info 1:0:0 +libcatacomb_la_LDFLAGS = -version-info 2:0:0 ## Middle number is the patchlevel. Final number is the minor version. The ## difference between the first and last numbers is major version. define(`emit', `$1.h ') pkginclude_HEADERS = \ - paranoia.h \ + arena.h paranoia.h \ blkc.h hash.h \ gcipher.h ghash.h gmac.h grand.h \ ghash-def.h \ - rc4.h \ - rand.h noise.h \ + rc4.h seal.h \ + rand.h noise.h fipstest.h maurer.h \ key.h key-data.h passphrase.h pixie.h lmem.h \ lcrand.h fibrand.h \ mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \ @@ -184,6 +211,7 @@ pkginclude_HEADERS = \ primetab.h pfilt.h primorial.h rabin.h \ pgen.h prim.h strongprime.h \ bbs.h rsa.h dh.h dsarand.h dsa.h \ + gfshare.h share.h \ allwithsuffix(`ciphers', `cipher_modes', `.h') \ allwithsuffix(`hashes', `hash_modes', `.h') \ addsuffix(`cipher_modes', `-def.h') \ @@ -191,12 +219,17 @@ pkginclude_HEADERS = \ 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 \ + grand.c keysz.c \ + des-base.c des-base.h \ + cast-s.c cast-sk.c cast-base.h cast-tab.h \ + daftstory.h \ + rc4.c seal.c \ + rand.c noise.c fipstest.c maurer.c \ + arena.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 \ + key-fetch.c \ passphrase.c pixie-client.c pixie-common.c lmem.c \ lcrand.c fibrand.c \ mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \ @@ -208,28 +241,37 @@ libcatacomb_la_SOURCES = \ mpcrt.c \ mprand.c \ primetab.c pfilt.c rabin.c primorial.c \ - pgen.c pgen-stdev.c pgen-safe.c prim.c strongprime.c \ - bbs-rand.c bbs-gen.c bbs-jump.c \ - rsa-decrypt.c rsa-gen.c rsa-recover.c \ - dh-gen.c \ - dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \ + pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \ + bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \ + rsa-decrypt.c rsa-gen.c rsa-recover.c rsa-fetch.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 \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c') -des-base.lo: des_sp.h +des-base.lo: des-tab.h +blowfish.lo: blowfish-tab.h +twofish.lo: twofish-tab.h +rijndael.lo: rijndael-tab.h mpx.lo: mptypes.h ## --- Utility programs --- -bin_PROGRAMS = key pixie rspit +bin_PROGRAMS = dsig key pixie rspit bin_SCRIPTS = catacomb-config xpixie -noinst_PROGRAMS = des-mktab genprimes mptypes +noinst_PROGRAMS = \ + genprimes mptypes \ + des-mktab blowfish-mktab twofish-mktab rijndael-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 +pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c pixie_LDADD = rspit_SOURCES = rspit.c @@ -237,6 +279,21 @@ rspit_SOURCES = rspit.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 = + +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 = + genprimes_SOURCES = genprimes.c genprimes_LDADD = @@ -270,9 +327,15 @@ EXTRA_DIST = \ dist-hook: @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true - @mkdir $(distdir)/tests + @mkdir $(distdir)/tests || true @ln $(srcdir)/tests/* $(distdir)/tests || true @rm -f $(distdir)/tests/*~ +# kr=$$HOME/.catacomb/dsig-keyring; \ +# if [ -r $$kr ]; then \ +# cd $(distdir); \ +# ../key -k $$kr extract -f -secret KEYRING; \ +# find . -type f -print0 | ../dsig -k $$kr sign -0 -oMANIFEST; \ +# fi ## --- Testing --- @@ -287,6 +350,7 @@ $1.t: $1.to $1.o libcatacomb.la $(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t') CTESTRIG(rc4) +CTESTRIG(seal) adorn(`nl`'CTESTRIG(', `ciphers', `)') adorn(`nl`'CTESTRIG(', `hashes', `)') adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)') @@ -310,10 +374,15 @@ CTESTRIG(dsa-sign) CTESTRIG(dsa-verify) CTESTRIG(bbs-rand) CTESTRIG(bbs-jump) +CTESTRIG(gfshare) +CTESTRIG(share) TESTS = testprogs -CLEANFILES = *.t *.to mptypes.h des_sp.h primetab.c primetab.h +CLEANFILES = \ + *.t *.to \ + mptypes.h primetab.c primetab.h \ + des-sp.h twofish-tab.h blowfish-tab.h ## --- Makefile building (haha!) --- -- 2.11.0