more photuris bits by bye bye

12 files changed, 4 insertions, 170 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 6bcaab672dc..ca39e4f69b4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.170 2002/08/31 07:28:32 miod Exp $
+#	$OpenBSD: Makefile,v 1.171 2002/09/06 21:30:22 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -130,15 +130,6 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/mtree; \
 		${INSTALL} -c -o root -g wheel -m 444 BSD.x11.dist \
 		    ${DESTDIR}/etc/mtree
-	cd photuris; \
-		${INSTALL} -c -o root -g wheel -m 600 secrets.conf \
-		    ${DESTDIR}/etc/photuris; \
-		${INSTALL} -c -o root -g wheel -m 600 attributes.conf \
-		    ${DESTDIR}/etc/photuris; \
-		${INSTALL} -c -o root -g wheel -m 600 photuris.conf \
-		    ${DESTDIR}/etc/photuris; \
-		${INSTALL} -c -o root -g wheel -m 600 photuris.startup \
-		    ${DESTDIR}/etc/photuris
 	cd ppp; \
 		${INSTALL} -c -o root -g wheel -m 600 chap-secrets \
 		    ${DESTDIR}/etc/ppp; \
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index d58136030d4..d8f585d4105 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.134 2002/07/18 21:32:28 provos Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.135 2002/09/06 21:30:22 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -89,11 +89,6 @@ mtree
 # ./etc/mtree
 ..
 
-# ./etc/photuris
-photuris
-# ./etc/photuris
-..
-
 # ./etc/ppp
 ppp
 # ./etc/ppp
diff --git a/etc/photuris/attributes.conf b/etc/photuris/attributes.conf
deleted file mode 100644
index a338465c007..00000000000
--- a/etc/photuris/attributes.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$OpenBSD: attributes.conf,v 1.6 2002/06/09 06:15:15 todd Exp $
-
-# Predefined keywords are AT_AH_ATTRIB, AT_ESP_ATTRIB
-# This is the default list, for VPN you can comment out
-# the AT_AH_ATTRIB section.
-AT_SHA1_IPMAC, 6, ident|auth, 20
-AT_MD5_IPMAC, 5, ident|auth, 16
-AT_ESP_ATTRIB
-	AT_HMAC_FLAG, 254, ,
-	AT_BLF_NEW, 16, enc, 56
-	AT_3DES_NEW, 18, enc, 24
-	AT_CAST_NEW, 17, enc, 16
-#	AT_DES_CBC, 8, enc, 8
-#	AT_RIPEMD_IPMAC, 7, auth, 20
-	AT_SHA1_IPMAC
-	AT_MD5_IPMAC
-AT_AH_ATTRIB
-	AT_HMAC_FLAG
-#	AT_RIPEMD_IPMAC
-	AT_MD5_IPMAC
-	AT_SHA1_IPMAC
diff --git a/etc/photuris/photuris.conf b/etc/photuris/photuris.conf
deleted file mode 100644
index d8813d9680d..00000000000
--- a/etc/photuris/photuris.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#	$OpenBSD: photuris.conf,v 1.3 2002/06/09 06:15:15 todd Exp $
-
-# Allowed keywords are: modulus and exchange
-# modulus <generator> <modulus>
-# exchange and DH_G_2_3DES_SHA1, DH_G_2_DES_MD5 or DH_G_2_MD5
-# config exchange_max_retransmits <number>
-# config exchange_retransmit_timeout <seconds>
-# config exchange_timeout  <seconds>
-# config exchange_lifetime <seconds>
-# config spi_lifetime <seconds>
-modulus 2 0xda58 3c16 d985 2289 d0e4 af75 6f4c ca92 dd4b e533 b804 fb0f ed94 ef9c 8a44 03ed 5746 50d3 6999 db29 d776 276b a2d3 d412 e218 f4dd 1e08 4cf6 d800 3e7c 4774 e833
-modulus 2 0x97f6 4261 cab5 05dd 2828 e13f 1d68 b6d3 dbd0 f313 047f 40e8 56da 58cb 13b8 a1bf 2b78 3a4c 6d59 d5f9 2afc 6cff 3d69 3f78 b23d 4f31 60a9 502e 3efa f7ab 5e1a d5a6 5e55 4313 828d a83b 9ff2 d941 dee9 5689 fada ea09 36ad df19 71fe 635b 20af 4703 6460 3c2d e059 f54b 650a d8fa 0cf7 0121 c747 99d7 5871 32be  9b99 9bb9 b787 e8ab
-exchange DH_G_2_3DES_SHA1 0
-exchange DH_G_2_DES_MD5 0
-exchange DH_G_2_MD5 1024
-exchange DH_G_2_MD5 512
-#
-config exchange_max_retransmits 3
-config exchange_retransmit_timeout 7
-config exchange_timeout 60
-config exchange_lifetime 3000
-config spi_lifetime 600
diff --git a/etc/photuris/photuris.startup b/etc/photuris/photuris.startup
deleted file mode 100644
index 46d86365ebd..00000000000
--- a/etc/photuris/photuris.startup
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: photuris.startup,v 1.4 2002/06/09 06:15:15 todd Exp $
-
-# Initial exchanges which might be needed by NIS or NFS servers
-# accepted keywords are
-# dst=<ip-address>
-# port=<port of peer daemon> (default = 468)
-# options=[enc,auth] (default options=enc,auth)
-# user=<username> (use this users secrets)
-# tsrc,tdst=ipaddr/ipmask (for tunnel accepted)
-# Separate by newlines
-# Example:
-#dst=134.100.106.2 port=468 options=enc,auth user=provos
-#tsrc=134.100.106.0/255.255.255.255
-#tdst=134.100.0.0/255.255.0.0
-#
-#dst=134.100.104.6 port=7468
diff --git a/etc/photuris/secrets.conf b/etc/photuris/secrets.conf
deleted file mode 100644
index 770e4b39572..00000000000
--- a/etc/photuris/secrets.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$OpenBSD: secrets.conf,v 1.3 2002/06/09 06:15:15 todd Exp $
-
-# Accepted keywords are:
-# identity local "id" "secret"
-# identity pair local "receivedid" "myid" "secret"
-# identity remote "id" "secret"
-# identity lookup "tag" username
-# Simple
-identity local "Default" "This should be changed."
-identity remote "Default" "This should be changed."
diff --git a/etc/rc b/etc/rc
index 7983b28cdd6..efb8630dae6 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.203 2002/08/20 08:42:59 hugh Exp $
+#	$OpenBSD: rc,v 1.204 2002/09/06 21:30:22 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -215,13 +215,6 @@ if [ "X${named_flags}" != X"NO" ]; then
 	echo 'starting named';		named $named_flags
 fi
 
-# $photurisd_flags is imported from /etc/rc.conf;
-# If $photurisd_flags == NO or /etc/photuris/photuris.conf doesn't exist, then
-# photurisd isn't run.
-if [ "X${photurisd_flags}" != X"NO" -a -e /etc/photuris/photuris.conf ]; then
-	echo 'starting photurisd';	photurisd ${photurisd_flags}
-fi
-
 # $isakmpd_flags is imported from /etc/rc.conf;
 # If $isakmpd_flags == NO or /etc/isakmpd/isakmpd.policy doesn't exist, then
 # isakmpd isn't run.
diff --git a/etc/rc.conf b/etc/rc.conf
index 7300b9c2523..c8469cbb9ad 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.78 2002/08/02 23:27:33 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.79 2002/09/06 21:30:22 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -17,7 +17,6 @@ named_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: [RFC868-host] or [-n RFC1361-host]
 timed_flags=NO		# for normal use: ""
 ntpdate_flags=NO	# for normal use: NTP server; run before ntpd starts
-photurisd_flags=NO	# for normal use: ""
 isakmpd_flags=NO	# for normal use: ""
 mopd_flags=NO		# for normal use: "-a"
 apmd_flags=NO		# for normal use: ""
diff --git a/share/ipsec/attributes.conf b/share/ipsec/attributes.conf
deleted file mode 100644
index 80a63a76d14..00000000000
--- a/share/ipsec/attributes.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#	$OpenBSD: attributes.conf,v 1.5 2001/02/03 08:20:36 niklas Exp $
-
-# Predefined keywords are AT_AH_ATTRIB, AT_ESP_ATTRIB
-# Not yet defined keywords serve as definitions with the
-# following syntax: name, photuris id, type, key length
-# This is the default list
-AT_SHA1_IPMAC, 6, ident|auth, 20
-AT_MD5_IPMAC, 5, ident|auth, 16
-AT_ESP_ATTRIB
-	AT_HMAC_FLAG, 254, , 
-	AT_BLF_NEW, 16, enc, 56
-	AT_3DES_NEW, 18, enc, 24
-	AT_CAST_NEW, 17, enc, 16
-	AT_DES_CBC, 8, enc, 8
-AT_AH_ATTRIB
-	AT_HMAC_FLAG
-	AT_MD5_IPMAC
-	AT_SHA1_IPMAC
-# This is the list for 134.100.104, only authentication.
-134.100.104.0 255.255.255.0
-AT_MD5_IPMAC
-AT_AH_ATTRIB
-	AT_SHA1_IPMAC
-	AT_MD5_IPMAC
diff --git a/share/ipsec/photuris.conf b/share/ipsec/photuris.conf
deleted file mode 100644
index 5deed2bcb25..00000000000
--- a/share/ipsec/photuris.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#	$OpenBSD: photuris.conf,v 1.4 2001/02/03 08:20:36 niklas Exp $
-
-# Allowed keywords are: modulus and exchange
-# modulus <generator> <modulus>
-# exchange and DH_G_2_3DES_SHA1, DH_G_2_DES_MD5 or DH_G_2_MD5
-# config exchange_max_retransmits <number>
-# config exchange_retransmit_timeout <seconds>
-# config exchange_timeout  <seconds>
-# config exchange_lifetime <seconds>
-# config spi_lifetime <seconds>
-modulus 2 0x991b54d446856f383f53da1482990c133a9a6179028eaafa55d176533e8f7ac52059c504c70ebef5dfd1d82d8ba741c4f3cf1f8ed7ace70ea6cfc4da9bc790991a58cdab647561b83f6c9b73fc638a19f0d9cfacb7e64b04cbe1f68bf49a0bd9981b7906034163f0f63cd0d69b6ac079e6da47659ef2c2ae3afa59a2c929048675375218f64a192351766db97f7bf331fec9ff8e2b1cb1ec4be8b432056bf525f5e171cf5b7a975dc38d1824fd0d2815f69abe8edb46809aec8214b964ea527167b1467b97a0f329b712fb13f5924d2577e1e67d64347e1b67997de818e567145e8ad21c6cd387541b9dfaca432f6e1abd796bf59c17149779c37075d873bff3
-modulus 2 0xda583c16d9852289d0e4af756f4cca92dd4be533b804fb0fed94ef9c8a4403ed574650d36999db29d776276ba2d3d412e218f4dd1e084cf6d8003e7c4774e833
-modulus 2 0x97f64261cab505dd2828e13f1d68b6d3dbd0f313047f40e856da58cb13b8a1bf2b783a4c6d59d5f92afc6cff3d693f78b23d4f3160a9502e3efaf7ab5e1ad5a65e554313828da83b9ff2d941dee95689fadaea0936addf1971fe635b20af470364603c2de059f54b650ad8fa0cf70121c74799d7587132be9b999bb9b787e8ab
-exchange DH_G_2_3DES_SHA1 0
-exchange DH_G_2_DES_MD5 0
-#exchange DH_G_2_MD5 2048
-exchange DH_G_2_MD5 1024
-exchange DH_G_2_MD5 512
-# 
-config exchange_max_retransmits 3
-config exchange_retransmit_timeout 10
-config exchange_timeout 60
-config exchange_lifetime 1000
-config spi_lifetime 180
diff --git a/share/ipsec/photuris.startup b/share/ipsec/photuris.startup
deleted file mode 100644
index f960bd87a5a..00000000000
--- a/share/ipsec/photuris.startup
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: photuris.startup,v 1.2 2001/02/03 08:20:36 niklas Exp $
-
-# Initial exchanges which might be needed by NIS or NFS servers
-dst=134.100.106.2 port=468 options=enc,auth user=provos
-tsrc=134.100.106.0/255.255.255.255
-tdst=134.100.0.0/255.255.0.0
-
-dst=134.100.104.6 port=7468
diff --git a/share/ipsec/secrets.conf b/share/ipsec/secrets.conf
deleted file mode 100644
index 67142a55fa1..00000000000
--- a/share/ipsec/secrets.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#	$OpenBSD: secrets.conf,v 1.3 2001/02/03 08:20:36 niklas Exp $
-
-# Simple 
-identity local "Niels" "Niels for one"
-# Pairs
-identity pair local "Niels" "Niels-Niels" "Niels to Niels"
-identity pair local "Apple" "Niels-Apple" "Niels to Apple"
-identity pair local "Baker" "Niels-Baker" "Niels to Baker"
-# Remote secrets
-identity remote "Niels-Apple" "Niels to Apple"
-identity remote "Niels-Niels" "Niels to Niels"
-identity remote "Niels-Baker" "Niels to Baker"
-identity remote "Apple-Niels" "Apple to Niels"
-identity remote "Baker-Niels" "Baker to Niels"
-identity remote "Apple" "all for one"
-identity remote "Niels" "Niels for one"
-identity remote "Baker" "one for all"
-identity remote "Baker-Apple" "Baker to Apple"
-identity remote "Apple-Apple" "Apple to Apple"