From de5585f802b72173c3079eec9a9394a7b626c84e Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Wed, 22 Dec 1999 16:04:06 +0000
Subject: [PATCH] Lots of new files.

---
 Makefile.m4 | 55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index c9b517e..536007d 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.21 1999/12/13 15:47:58 mdw Exp $
+## $Id: Makefile.m4,v 1.22 1999/12/22 16:04:06 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.22  1999/12/22 16:04:06  mdw
+## Lots of new files.
+##
 ## Revision 1.21  1999/12/13 15:47:58  mdw
 ## Fix a couple of minor bugs in the distribution set.
 ##
@@ -133,8 +136,8 @@ $(MODES): $(srcdir)/genmodes
 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
+primetab.c primetab.h: genprimes
+	./genprimes -h primetab.h -c primetab.c -m 255 -t "unsigned char" -i primetab
 
 archinclude_HEADERS = mptypes.h
 
@@ -164,13 +167,14 @@ pkginclude_HEADERS = \
 	ghash-def.h \
 	rc4.h \
 	rand.h noise.h \
-	key.h \
+	key.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 \
-	ptab.h pgen.h rabin.h \
-	bbs.h dsa.h dh.h \
+	primetab.h pfilt.h primorial.h rabin.h \
+	pgen.h prim.h strongprime.h \
+	bbs.h rsa.h dsarand.h dsa.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
 	allwithsuffix(`hashes', `hash_modes', `.h') \
 	addsuffix(`cipher_modes', `-def.h') \
@@ -182,7 +186,9 @@ libcatacomb_la_SOURCES = \
 	des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
 	rc4.c \
 	rand.c noise.c \
-	key.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 \
+	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 \
 	mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
@@ -192,10 +198,11 @@ libcatacomb_la_SOURCES = \
 	mpbarrett.c mpmont.c mpmont-mexp.c \
 	mpcrt.c \
 	mprand.c \
-	ptab.c pgen.c rabin.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 \
-	dsa-sign.c dsa-verify.c dsa-gen.c \
-	dh-prime.c \
+	rsa-decrypt.c rsa-gen.c rsa-recover.c \
+	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
@@ -205,13 +212,16 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = key
-bin_SCRIPTS = catacomb-config
-noinst_PROGRAMS = des-mktab genprimes mptypes rspit
+bin_PROGRAMS = key pixie rspit
+bin_SCRIPTS = catacomb-config xpixie
+noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+pixie_SOURCES = pixie.c pixie-common.c lmem.c 
+pixie_LDADD =
+
 rspit_SOURCES = rspit.c
 
 des_mktab_SOURCES = des-mktab.c
@@ -223,6 +233,21 @@ genprimes_LDADD =
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
+## --- Install the pixie setuid-root if we can ---
+
+changequote(<, >)
+install-exec-hook:
+	@pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
+	if chown root $$pixie && chmod 4755 $$pixie; then \
+	  echo "chown root $$pixie"; \
+	  echo "chmod 4755 $$pixie"; \
+	else \
+	  echo "***"; \
+	  echo "*** You should probably install $$pixie setuid-root."; \
+	  echo "***"; \
+	fi
+changequote(`, ')
+
 ## --- Documentation ---
 
 man_MANS = key.1 keyring.5
@@ -230,7 +255,7 @@ man_MANS = key.1 keyring.5
 ## --- Other handy definitions ---
 
 EXTRA_DIST = \
-	Makefile.m4 genmodes $(man_MANS) \
+	Makefile.m4 genmodes $(man_MANS) xpixie \
 	README.cipher README.hash README.random README.mp
 
 dist-hook:
@@ -278,7 +303,7 @@ CTESTRIG(bbs-jump)
 
 TESTS = testprogs
 
-CLEANFILES = *.t *.to mptypes.h des_sp.h ptab.c ptab.h
+CLEANFILES = *.t *.to mptypes.h des_sp.h primetab.c primetab.h
 
 ## --- Makefile building (haha!) ---
 
-- 
2.11.0