[src/trunk]: src/sys remove unnecessary #include <netkey/key_debug.h>. from ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys remove unnecessary #include <netkey/key_debug.h>. from ...
From: itojun <itojun%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 07:46:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/8423d196524a
branches:  trunk
changeset: 494440:8423d196524a
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jul 06 12:51:39 2000 +0000

description:
remove unnecessary #include <netkey/key_debug.h>.  from kame.

diffstat:

 sys/netinet/in_pcb.c         |   3 +--
 sys/netinet/ip_icmp.c        |   3 +--
 sys/netinet/ip_input.c       |   3 +--
 sys/netinet/udp_usrreq.c     |   3 +--
 sys/netinet6/ah_output.c     |   5 ++---
 sys/netinet6/esp_output.c    |  29 ++++++++++++++++++++++-------
 sys/netinet6/in6_pcb.c       |   5 ++---
 sys/netinet6/ip6_forward.c   |   5 ++---
 sys/netinet6/ip6_output.c    |   5 ++---
 sys/netinet6/ipcomp_input.c  |   8 ++++----
 sys/netinet6/ipcomp_output.c |  10 +++++-----
 11 files changed, 43 insertions(+), 36 deletions(-)

diffs (280 lines):

diff -r 1653d9fd9cac -r 8423d196524a sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c      Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet/in_pcb.c      Thu Jul 06 12:51:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_pcb.c,v 1.65 2000/04/03 03:51:16 enami Exp $        */
+/*     $NetBSD: in_pcb.c,v 1.66 2000/07/06 12:51:39 itojun Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -129,7 +129,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif /* IPSEC */
 
 struct in_addr zeroin_addr;
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet/ip_icmp.c
--- a/sys/netinet/ip_icmp.c     Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet/ip_icmp.c     Thu Jul 06 12:51:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_icmp.c,v 1.49 2000/07/01 21:46:40 sommerfeld Exp $  */
+/*     $NetBSD: ip_icmp.c,v 1.50 2000/07/06 12:51:40 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -132,7 +132,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif
 
 #include <machine/stdarg.h>
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet/ip_input.c    Thu Jul 06 12:51:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.115 2000/06/28 03:01:16 mrg Exp $       */
+/*     $NetBSD: ip_input.c,v 1.116 2000/07/06 12:51:40 itojun Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -147,7 +147,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif
 
 #ifndef        IPFORWARDING
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet/udp_usrreq.c  Thu Jul 06 12:51:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.67 2000/06/28 03:01:17 mrg Exp $      */
+/*     $NetBSD: udp_usrreq.c,v 1.68 2000/07/06 12:51:40 itojun Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -115,7 +115,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif /*IPSEC*/
 
 #ifdef IPKDB
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/ah_output.c
--- a/sys/netinet6/ah_output.c  Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/ah_output.c  Thu Jul 06 12:51:39 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ah_output.c,v 1.9 2000/06/02 18:20:16 itojun Exp $     */
-/*     $KAME: ah_output.c,v 1.21 2000/05/29 08:05:03 itojun Exp $      */
+/*     $NetBSD: ah_output.c,v 1.10 2000/07/06 12:51:40 itojun Exp $    */
+/*     $KAME: ah_output.c,v 1.22 2000/07/03 13:23:28 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -68,7 +68,6 @@
 #include <netinet6/ah.h>
 #include <netkey/key.h>
 #include <netkey/keydb.h>
-#include <netkey/key_debug.h>
 
 #include <net/net_osdep.h>
 
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/esp_output.c
--- a/sys/netinet6/esp_output.c Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/esp_output.c Thu Jul 06 12:51:39 2000 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: esp_output.c,v 1.1.1.1 2000/06/14 19:39:42 thorpej Exp $       */
-/*     $KAME: esp_output.c,v 1.17 2000/02/22 14:04:15 itojun Exp $     */
+/*     $NetBSD: esp_output.c,v 1.2 2000/07/06 12:51:40 itojun Exp $    */
+/*     $KAME: esp_output.c,v 1.22 2000/07/03 13:23:28 itojun Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -68,7 +68,6 @@
 #include <netinet6/esp.h>
 #include <netkey/key.h>
 #include <netkey/keydb.h>
-#include <netkey/key_debug.h>
 
 #include <net/net_osdep.h>
 
@@ -536,8 +535,24 @@
        if (AH_MAXSUMSIZE < siz)
                panic("assertion failed for AH_MAXSUMSIZE");
 
-       if (esp_auth(m, espoff, m->m_pkthdr.len - espoff, sav, authbuf))
-               goto noantireplay;
+       if (esp_auth(m, espoff, m->m_pkthdr.len - espoff, sav, authbuf)) {
+               ipseclog((LOG_ERR, "ESP checksum generation failure\n"));
+               m_freem(m);
+               error = EINVAL;
+               switch (af) {
+#ifdef INET
+               case AF_INET:
+                       ipsecstat.out_inval++;
+                       break;
+#endif
+#ifdef INET6
+               case AF_INET6:
+                       ipsec6stat.out_inval++;
+                       break;
+#endif
+               }
+               goto fail;
+       }
 
        n = m;
        while (n->m_next)
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/in6_pcb.c    Thu Jul 06 12:51:39 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: in6_pcb.c,v 1.27 2000/07/02 08:04:11 itojun Exp $      */
-/*     $KAME: in6_pcb.c,v 1.55 2000/07/02 07:50:30 itojun Exp $        */
+/*     $NetBSD: in6_pcb.c,v 1.28 2000/07/06 12:51:41 itojun Exp $      */
+/*     $KAME: in6_pcb.c,v 1.56 2000/07/03 13:23:28 itojun Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif /* IPSEC */
 
 struct in6_addr zeroin6_addr;
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/ip6_forward.c        Thu Jul 06 12:51:39 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ip6_forward.c,v 1.13 2000/06/30 19:46:05 itojun Exp $  */
-/*     $KAME: ip6_forward.c,v 1.38 2000/06/22 21:02:05 itojun Exp $    */
+/*     $NetBSD: ip6_forward.c,v 1.14 2000/07/06 12:51:41 itojun Exp $  */
+/*     $KAME: ip6_forward.c,v 1.39 2000/07/03 13:23:28 itojun Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -56,7 +56,6 @@
 #ifdef IPSEC_IPV6FWD
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif /* IPSEC_IPV6FWD */
 
 #ifdef IPV6FIREWALL
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/ip6_output.c Thu Jul 06 12:51:39 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ip6_output.c,v 1.23 2000/06/20 02:24:42 itojun Exp $   */
-/*     $KAME: ip6_output.c,v 1.109 2000/05/31 05:03:09 jinmei Exp $    */
+/*     $NetBSD: ip6_output.c,v 1.24 2000/07/06 12:51:41 itojun Exp $   */
+/*     $KAME: ip6_output.c,v 1.115 2000/07/03 13:23:28 itojun Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,6 @@
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
-#include <netkey/key_debug.h>
 #endif /* IPSEC */
 
 #include "loop.h"
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/ipcomp_input.c
--- a/sys/netinet6/ipcomp_input.c       Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/ipcomp_input.c       Thu Jul 06 12:51:39 2000 +0000
@@ -1,9 +1,10 @@
-/*     $NetBSD: ipcomp_input.c,v 1.10 2000/02/17 10:59:39 darrenr Exp $        */
+/*     $NetBSD: ipcomp_input.c,v 1.11 2000/07/06 12:51:41 itojun Exp $ */
+/*     $KAME: ipcomp_input.c,v 1.15 2000/07/03 13:23:28 itojun Exp $   */
 
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -69,7 +70,6 @@
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
 #include <netkey/keydb.h>
-#include <netkey/key_debug.h>
 
 #include <machine/stdarg.h>
 
diff -r 1653d9fd9cac -r 8423d196524a sys/netinet6/ipcomp_output.c
--- a/sys/netinet6/ipcomp_output.c      Thu Jul 06 12:46:48 2000 +0000
+++ b/sys/netinet6/ipcomp_output.c      Thu Jul 06 12:51:39 2000 +0000
@@ -1,9 +1,10 @@
-/*     $NetBSD: ipcomp_output.c,v 1.10 2000/05/19 04:34:43 thorpej Exp $       */
+/*     $NetBSD: ipcomp_output.c,v 1.11 2000/07/06 12:51:41 itojun Exp $        */
+/*     $KAME: ipcomp_output.c,v 1.15 2000/07/03 13:23:28 itojun Exp $  */
 
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -69,7 +70,6 @@
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
 #include <netkey/keydb.h>
-#include <netkey/key_debug.h>
 
 #include <machine/stdarg.h>
 
@@ -90,7 +90,7 @@
  * during the encryption:
  *     m   nexthdrp mprev md
  *     v   v        v     v
- *     IP ............... ipcomp payload 
+ *     IP ............... ipcomp payload
  *                        <-----><----->
  *                        complen  plen
  *     <-> hlen
Prev by Date: [src/trunk]: src/sys/net remove #ifdef __FreeBSD__ or __bsdi__, as netbsd if_...
Next by Date: [src/trunk]: src Use ':' as group prefix; suggested by hubertf.
Previous by Thread: [src/trunk]: src/sys/net remove #ifdef __FreeBSD__ or __bsdi__, as netbsd if_...
Next by Thread: [src/trunk]: src Use ':' as group prefix; suggested by hubertf.
Indexes:
Home | Main Index | Thread Index | Old Index