X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/de5585f802b72173c3079eec9a9394a7b626c84e..876b4f53ca713ab45a1b99d5cce8b90da7e2315f:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 536007d..bf7b533 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.22 1999/12/22 16:04:06 mdw Exp $
+## $Id: Makefile.m4,v 1.24 2000/02/12 18:22:26 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,12 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.24  2000/02/12 18:22:26  mdw
+## Missed a file.  Whoops.
+##
+## Revision 1.23  2000/02/12 18:21:01  mdw
+## Overhaul of key management (again).
+##
 ## Revision 1.22  1999/12/22 16:04:06  mdw
 ## Lots of new files.
 ##
@@ -167,14 +173,14 @@ pkginclude_HEADERS = \
 	ghash-def.h \
 	rc4.h \
 	rand.h noise.h \
-	key.h passphrase.h pixie.h lmem.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 \
 	mpbarrett.h mpmont.h mpcrt.h \
 	mprand.h \
 	primetab.h pfilt.h primorial.h rabin.h \
 	pgen.h prim.h strongprime.h \
-	bbs.h rsa.h dsarand.h dsa.h \
+	bbs.h rsa.h dh.h dsarand.h dsa.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.h') \
@@ -186,8 +192,8 @@ libcatacomb_la_SOURCES = \
 	des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
 	rc4.c \
 	rand.c noise.c \
-	key-misc.c key-file.c key-data.c key-attr.c key-flags.c \
-		key-io.c key-pass.c key-moan.c \
+	key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
+	key-misc.c key-file.c key-attr.c key-io.c key-moan.c key-error.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 \
@@ -202,6 +208,7 @@ libcatacomb_la_SOURCES = \
 	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 \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
@@ -212,7 +219,7 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = key pixie rspit
+bin_PROGRAMS = key pixie rspit distsig
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
@@ -224,6 +231,8 @@ pixie_LDADD =
 
 rspit_SOURCES = rspit.c
 
+distsig_SOURCES = distsig.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =