7 files changed, 14 insertions, 22 deletions
diff --git a/sbin/brconfig/brconfig.8 b/sbin/brconfig/brconfig.8
index f229a06b2d2..c953bfc17f8 100644
--- a/sbin/brconfig/brconfig.8
+++ b/sbin/brconfig/brconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: brconfig.8,v 1.37 2002/07/12 17:49:02 jason Exp $
+.\"	$OpenBSD: brconfig.8,v 1.38 2002/09/06 21:36:52 deraadt Exp $
 .\"
 .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -197,8 +197,6 @@ If appropriate security associations (SAs) exist, they will be used to
 encrypt or decrypt the packets.
 Otherwise, any key management daemons such as
 .Xr isakmpd 8
-or
-.Xr photurisd 8
 that are running on the bridge will be invoked to establish the
 necessary SAs.
 These daemons have to be configured as if they were running on the
@@ -414,8 +412,7 @@ commands are used to add and delete span ports to and from a bridge.
 .Xr bridgename.if 5 ,
 .Xr ifconfig 8 ,
 .Xr ipsecadm 8 ,
-.Xr isakmpd 8 ,
-.Xr photurisd 8
+.Xr isakmpd 8
 .Sh AUTHORS
 The
 .Xr brconfig 8
diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8
index 47a7ed9e8c5..131c80701e5 100644
--- a/sbin/ipsecadm/ipsecadm.8
+++ b/sbin/ipsecadm/ipsecadm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsecadm.8,v 1.51 2002/06/10 15:42:24 kjell Exp $
+.\" $OpenBSD: ipsecadm.8,v 1.52 2002/09/06 21:36:52 deraadt Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -690,6 +690,5 @@ Delete all esp SAs and their flows and routing information:
 .Xr protocols 5 ,
 .Xr services 5 ,
 .Xr sysctl.conf 5 ,
-.Xr isakmpd 8 ,
-.Xr photurisd 8 ,
+.Xr isakmpd 8
 .Xr vpn 8
diff --git a/sbin/isakmpd/crypto.h b/sbin/isakmpd/crypto.h
index 69fc36015df..b38e7e92e24 100644
--- a/sbin/isakmpd/crypto.h
+++ b/sbin/isakmpd/crypto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.h,v 1.6 2002/08/23 18:17:17 ho Exp $	*/
+/*	$OpenBSD: crypto.h,v 1.7 2002/09/06 21:36:52 deraadt Exp $	*/
 /*	$EOM: crypto.h,v 1.12 2000/10/15 21:56:41 niklas Exp $	*/
 
 /*
@@ -142,7 +142,7 @@ enum cryptoerr {
   EOKAY,			/* No error */
   ENOCRYPTO,			/* A none crypto related error, see errno */
   EWEAKKEY,			/* A weak key was found in key setup */
-  EKEYLEN,			/* The key length was invalid for the cipher */
+  EKEYLEN			/* The key length was invalid for the cipher */
 };
 
 struct crypto_xf {
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index fb996de793d..b47f73b421e 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.42 2002/08/07 13:19:20 ho Exp $
+.\" $OpenBSD: isakmpd.8,v 1.43 2002/09/06 21:36:52 deraadt Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -484,7 +484,6 @@ and keynote policy configuration files.
 .Xr getnameinfo 3 ,
 .Xr openssl 1 ,
 .Xr pcap 3 ,
-.Xr photurisd 8 ,
 .Xr ssl 8 ,
 .Xr tcpdump 8 ,
 .Xr vpn 8
diff --git a/sbin/isakmpd/math_group.h b/sbin/isakmpd/math_group.h
index d85e625ba5d..75f2c0887da 100644
--- a/sbin/isakmpd/math_group.h
+++ b/sbin/isakmpd/math_group.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: math_group.h,v 1.5 1999/04/19 20:00:24 niklas Exp $	*/
+/*	$OpenBSD: math_group.h,v 1.6 2002/09/06 21:36:52 deraadt Exp $	*/
 /*	$EOM: math_group.h,v 1.7 1999/04/17 23:20:40 niklas Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 enum groups {
   MODP,				/* F_p, Z modulo a prime */
   EC2N,				/* Elliptic Curve over the Field GF(2**N) */
-  ECP,				/* Elliptic Curve over the Field Z_p */
+  ECP				/* Elliptic Curve over the Field Z_p */
 };
 
 /*
diff --git a/sbin/isakmpd/prf.h b/sbin/isakmpd/prf.h
index 07e7c830d19..7f8c50212eb 100644
--- a/sbin/isakmpd/prf.h
+++ b/sbin/isakmpd/prf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prf.h,v 1.5 2001/01/27 12:03:36 niklas Exp $	*/
+/*	$OpenBSD: prf.h,v 1.6 2002/09/06 21:36:52 deraadt Exp $	*/
 /*	$EOM: prf.h,v 1.1 1998/07/11 20:06:22 provos Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 
 /* Enumeration of possible PRF - Pseudo-Random Functions.  */
 enum prfs {
-  PRF_HMAC = 0,			/* No PRFs in drafts, this is the default */
+  PRF_HMAC = 0			/* No PRFs in drafts, this is the default */
 };
 
 struct prf {
diff --git a/share/man/man5/moduli.5 b/share/man/man5/moduli.5
index 7ea03b152ea..c6a37a80888 100644
--- a/share/man/man5/moduli.5
+++ b/share/man/man5/moduli.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: moduli.5,v 1.4 2002/08/29 07:34:31 wcobb Exp $
+.\" $OpenBSD: moduli.5,v 1.5 2002/09/06 21:36:52 deraadt Exp $
 .\"
 .\" Copyright 1997, 2000 William Allen Simpson <wsimpson@greendragon.com>
 .\" All rights reserved.
@@ -39,11 +39,8 @@
 .Sh DESCRIPTION
 The
 .Pa /etc/moduli
-file contains the system-wide Diffie-Hellman prime moduli for the
-.Xr photurisd 8
-and
-.Xr sshd 8
-programs.
+file contains the system-wide Diffie-Hellman prime moduli for
+.Xr sshd .
 .Pp
 Each line in this file contains the following fields:
 Time, Type, Tests, Tries, Size, Generator, Modulus.