Consistently spell "IPsec" in comments and debug outputs.

From Raf Czlonka, ok sthen@

6 files changed, 15 insertions, 15 deletions

diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 052d859bc9b..ead11b71061 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nameser.h,v 1.13 2015/01/16 00:01:28 deraadt Exp $	*/
+/*	$OpenBSD: nameser.h,v 1.14 2018/03/16 12:31:09 mpi Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1989, 1993
@@ -223,7 +223,7 @@
 #define	KEYFLAG_USERACCOUNT	0x0400	/* key is assoc. with a user acct */
 #define	KEYFLAG_ENTITY		0x0200	/* key is assoc. with entity eg host */
 #define	KEYFLAG_ZONEKEY		0x0100	/* key is zone key for the zone named */
-#define	KEYFLAG_IPSEC		0x0080  /* key is for IPSEC use (host or user)*/
+#define	KEYFLAG_IPSEC		0x0080  /* key is for IPsec use (host or user)*/
 #define	KEYFLAG_EMAIL		0x0040  /* key is for email (MIME security) */
 #define	KEYFLAG_RESERVED10	0x0020  /* reserved - must be zero */
 #define	KEYFLAG_RESERVED11	0x0010  /* reserved - must be zero */
diff --git a/lib/libcrypto/ec/ec_curve.c b/lib/libcrypto/ec/ec_curve.c
index 1ee2a7c8e81..d4f6c28d1e8 100644
--- a/lib/libcrypto/ec/ec_curve.c
+++ b/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.16 2018/03/16 12:31:09 mpi Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -2135,7 +2135,7 @@ static const struct {
 	}
 };
 
-/* IPSec curves */
+/* IPsec curves */
 /* NOTE: The of curves over a extension field of non prime degree
  * is not recommended (Weil-descent).
  * As the group order is not a prime this curve is not suitable
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h
index 9deca37f2d0..49b7333c7b1 100644
--- a/sbin/iked/iked.h
+++ b/sbin/iked/iked.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iked.h,v 1.117 2017/11/30 12:18:44 patrick Exp $	*/
+/*	$OpenBSD: iked.h,v 1.118 2018/03/16 12:31:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -165,7 +165,7 @@ RB_HEAD(iked_flows, iked_flow);
 TAILQ_HEAD(iked_saflows, iked_flow);
 
 struct iked_childsa {
-	uint8_t				 csa_saproto;	/* IPSec protocol */
+	uint8_t				 csa_saproto;	/* IPsec protocol */
 	unsigned int			 csa_dir;	/* in/out */
 
 	uint64_t			 csa_peerspi;	/* peer relation */
@@ -432,8 +432,8 @@ struct iked_sa {
 	struct ibuf			*sa_eapmsk;	/* EAK session key */
 
 	struct iked_proposals		 sa_proposals;	/* SA proposals */
-	struct iked_childsas		 sa_childsas;	/* IPSec Child SAs */
-	struct iked_saflows		 sa_flows;	/* IPSec flows */
+	struct iked_childsas		 sa_childsas;	/* IPsec Child SAs */
+	struct iked_saflows		 sa_flows;	/* IPsec flows */
 
 	struct iked_sa			*sa_nexti;	/* initiated IKE SA */
 	struct iked_sa			*sa_nextr;	/* simultaneous rekey */
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index cba5d23b084..3370787a455 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.234 2018/02/19 08:59:53 mpi Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.235 2018/03/16 12:31:09 mpi Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -1040,7 +1040,7 @@ ip6_ctloutput(int op, struct socket *so, int level, int optname,
 	void *optdata;
 	struct inpcb *inp = sotoinpcb(so);
 	int error, optval;
-	struct proc *p = curproc; /* For IPSec and rdomain */
+	struct proc *p = curproc; /* For IPsec and rdomain */
 	u_int rtid = 0;
 
 	error = optval = 0;
diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c
index 7ae9b1e80be..21025defa46 100644
--- a/usr.sbin/dhcrelay/dhcrelay.c
+++ b/usr.sbin/dhcrelay/dhcrelay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcrelay.c,v 1.63 2017/07/05 11:11:56 reyk Exp $ */
+/*	$OpenBSD: dhcrelay.c,v 1.64 2018/03/16 12:31:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
 				fatalx("don't mix interfaces with hosts");
 
 			if (sp->intf->hw_address.htype == HTYPE_IPSEC_TUNNEL)
-				fatalx("can't use IPSec with layer 2");
+				fatalx("can't use IPsec with layer 2");
 
 			sp->next = servers;
 			servers = sp;
diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
index 688cbc377f4..7255d735872 100644
--- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c
+++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2tp_ctrl.c,v 1.21 2015/12/05 18:43:36 mmcc Exp $	*/
+/*	$OpenBSD: l2tp_ctrl.c,v 1.22 2018/03/16 12:31:09 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /**@file Control connection processing functions for L2TP LNS */
-/* $Id: l2tp_ctrl.c,v 1.21 2015/12/05 18:43:36 mmcc Exp $ */
+/* $Id: l2tp_ctrl.c,v 1.22 2018/03/16 12:31:09 mpi Exp $ */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
@@ -442,7 +442,7 @@ l2tp_ctrl_purge_ipsec_sa(l2tp_ctrl *_this)
 #endif
 	if (ipsec_util_purge_transport_sa((struct sockaddr *)&peer,
 	    (struct sockaddr *)&sock, proto, IPSEC_UTIL_DIRECTION_BOTH) != 0)
-		l2tp_ctrl_log(_this, LOG_NOTICE, "failed to purge IPSec SA");
+		l2tp_ctrl_log(_this, LOG_NOTICE, "failed to purge IPsec SA");
 }
 #endif