Major new upstream release, just ran svn-upgrade for now (and wrote some

debian/changelong entries).

4 files changed, 0 insertions, 153 deletions

diff --git a/programs/_secretcensor/.cvsignore b/programs/_secretcensor/.cvsignore
deleted file mode 100644
index 202d856fe..000000000
--- a/programs/_secretcensor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-_secretcensor
diff --git a/programs/_secretcensor/Makefile b/programs/_secretcensor/Makefile
deleted file mode 100644
index 3df15286e..000000000
--- a/programs/_secretcensor/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for miscelaneous programs
-# Copyright (C) 2002  Michael Richardson	<mcr@freeswan.org>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.1 2004/03/15 20:35:27 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PROGRAM=_secretcensor
-PROGRAMDIR=${LIBDIR}
-
-include ../Makefile.program
-
-#
-# $Log: Makefile,v $
-# Revision 1.1  2004/03/15 20:35:27  as
-# added files from freeswan-2.04-x509-1.5.3
-#
-# Revision 1.3  2002/08/02 16:01:38  mcr
-# 	moved user visible programs to $PREFIX/libexec, while moving
-# 	private files to $PREFIX/lib.
-#
-# Revision 1.2  2002/06/02 22:02:14  mcr
-# 	changed TOPDIR->FREESWANSRCDIR in all Makefiles.
-# 	(note that linux/net/ipsec/Makefile uses TOPDIR because this is the
-# 	kernel sense.)
-#
-# Revision 1.1  2002/04/24 07:55:32  mcr
-# 	#include patches and Makefiles for post-reorg compilation.
-#
-#
-#
-
diff --git a/programs/_secretcensor/_secretcensor.8 b/programs/_secretcensor/_secretcensor.8
deleted file mode 100644
index d502bbd37..000000000
--- a/programs/_secretcensor/_secretcensor.8
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH _SECRETCENSOR 8 "25 Apr 2002"
-.\"
-.\" RCSID $Id: _secretcensor.8,v 1.1 2004/03/15 20:35:27 as Exp $
-.\"
-.SH NAME
-ipsec _secretcensor \- internal routing to sanitize files
-.SH DESCRIPTION
-.I _secretcensor
-is called by
-.B ipsec barf
-to process the /etc/ipsec.secrets file to remove the private key components
-from the file prior to revealing the contents.
-.SH "SEE ALSO"
-ipsec(8), ipsec_barf(8).
-.SH HISTORY
-Man page written for the Linux FreeS/WAN project <http://www.freeswan.org/>
-by Michael Richardson. Original program by Henry Spencer.
-.\"
-.\" $Log: _secretcensor.8,v $
-.\" Revision 1.1  2004/03/15 20:35:27  as
-.\" added files from freeswan-2.04-x509-1.5.3
-.\"
-.\" Revision 1.2  2002/04/29 22:39:31  mcr
-.\" 	added basic man page for all internal commands.
-.\"
-.\" Revision 1.1  2002/04/26 01:21:43  mcr
-.\" 	while tracking down a missing (not installed) /etc/ipsec.conf,
-.\" 	MCR has decided that it is not okay for each program subdir to have
-.\" 	some subset (determined with -f) of possible files.
-.\" 	Each subdir that defines $PROGRAM, MUST have a PROGRAM.8 file as well as a PROGRAM file.
-.\" 	Optional PROGRAM.5 files have been added to the makefiles.
-.\"
-.\"
-.\"
diff --git a/programs/_secretcensor/_secretcensor.in b/programs/_secretcensor/_secretcensor.in
deleted file mode 100755
index 150c13cbc..000000000
--- a/programs/_secretcensor/_secretcensor.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# implements secret censoring for barf
-# Copyright (C) 1999  Henry Spencer.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: _secretcensor.in,v 1.1 2004/03/15 20:35:27 as Exp $
-
-usage="Usage: $0 [file ...]"
-me="ipsec _secretcensor"
-
-for dummy
-do
-	case "$1" in
-	--help)		echo "$usage" ; exit 0	;;
-	--version)	echo "$me $IPSEC_VERSION" ; exit 0		;;
-	--)		shift ; break		;;
-	-*)		echo "$0: unknown option \`$1'" >&2 ; exit 2	;;
-	*)		break			;;
-	esac
-	shift
-done
-
-awk '	function cool(hot,   q, cooled, run) {
-		# warning:  may destroy input line!
-		q = "'"'"'"	# single quote
-		if (hot ~ q)
-			return "[cannot be summed]"
-		if (hot ~ /^0s/)
-			return "[keyid " substr(hot, 3, 9) "]"
-		run = "echo " q hot q " | md5sum"
-		run | getline
-		close(run)
-		return "[sums to " substr($1, 1, 4) "...]"
-	}
-	/"/ {
-		i = match($0, /"[^"]+"/)
-		cold1 = substr($0, 1, i)
-		cold2 = substr($0, i+RLENGTH-1)
-		hot = substr($0, i+1, RLENGTH-2)
-		print cold1 cool(hot) cold2
-		next
-	}
-	/#pubkey=/ {
-		i = match($0, /^.*#pubkey=/)
-		i += RLENGTH-1
-		cold = substr($0, 1, i)
-		hot = substr($0, i+1)
-		print cold cool(hot)
-		next
-	}
-	/#IN KEY / {
-		i = match($0, /^.*[ \t][^ \t]/)
-		i += RLENGTH-2
-		cold = substr($0, 1, i)
-		hot = substr($0, i+1)
-		print cold cool("0s" hot)
-		next
-	}
-	/^[ \t]+(Modulus|P[a-z]+Exponent|Prime[12]|Exponent[12]|Coefficient):/ {
-		i = match($0, /^[^:]*:[ \t]*/)
-		i += RLENGTH-1
-		cold = substr($0, 1, i)
-		print cold "[...]"
-		next
-	}
-	{ print }' $*