Module Name: src
Committed By: maxv
Date: Tue Apr 24 08:07:06 UTC 2018
Modified Files:
src/sys/netinet6: nd6_rtr.c
src/sys/netipsec: xform_ah.c xform_ipip.c
src/sys/sys: mbuf.h
Log Message:
Remove the M_AUTHIPDGM flag. It is equivalent to M_AUTHIPHDR, both
are set in IPsec-AH, and they are always handled together.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/netinet6/nd6_rtr.c
cvs rdiff -u -r1.93 -r1.94 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.67 -r1.68 src/sys/netipsec/xform_ipip.c
cvs rdiff -u -r1.187 -r1.188 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.138 src/sys/netinet6/nd6_rtr.c:1.139
--- src/sys/netinet6/nd6_rtr.c:1.138 Fri Jan 26 06:49:02 2018
+++ src/sys/netinet6/nd6_rtr.c Tue Apr 24 08:07:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.138 2018/01/26 06:49:02 ozaki-r Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.139 2018/04/24 08:07:05 maxv Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.138 2018/01/26 06:49:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.139 2018/04/24 08:07:05 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1122,14 +1122,7 @@ prelist_update(struct nd_prefixctl *newp
auth = 0;
if (m) {
- /*
- * Authenticity for NA consists authentication for
- * both IP header and IP datagrams, doesn't it ?
- */
-#if defined(M_AUTHIPHDR) && defined(M_AUTHIPDGM)
- auth = (m->m_flags & M_AUTHIPHDR
- && m->m_flags & M_AUTHIPDGM) ? 1 : 0;
-#endif
+ auth = (m->m_flags & M_AUTHIPHDR) ? 1 : 0;
}
if ((pr = nd6_prefix_lookup(newprc)) != NULL) {
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.93 src/sys/netipsec/xform_ah.c:1.94
--- src/sys/netipsec/xform_ah.c:1.93 Mon Apr 23 07:22:54 2018
+++ src/sys/netipsec/xform_ah.c Tue Apr 24 08:07:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.93 2018/04/23 07:22:54 maxv Exp $ */
+/* $NetBSD: xform_ah.c,v 1.94 2018/04/24 08:07:06 maxv Exp $ */
/* $FreeBSD: xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.93 2018/04/23 07:22:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.94 2018/04/24 08:07:06 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -829,7 +829,7 @@ ah_input_cb(struct cryptop *crp)
/*
* Header is now authenticated.
*/
- m->m_flags |= M_AUTHIPHDR|M_AUTHIPDGM;
+ m->m_flags |= M_AUTHIPHDR;
/*
* Update replay sequence number, if appropriate.
Index: src/sys/netipsec/xform_ipip.c
diff -u src/sys/netipsec/xform_ipip.c:1.67 src/sys/netipsec/xform_ipip.c:1.68
--- src/sys/netipsec/xform_ipip.c:1.67 Sun Apr 22 10:25:40 2018
+++ src/sys/netipsec/xform_ipip.c Tue Apr 24 08:07:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipip.c,v 1.67 2018/04/22 10:25:40 maxv Exp $ */
+/* $NetBSD: xform_ipip.c,v 1.68 2018/04/24 08:07:06 maxv Exp $ */
/* $FreeBSD: xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.67 2018/04/22 10:25:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.68 2018/04/24 08:07:06 maxv Exp $");
/*
* IP-inside-IP processing
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ipip.c
#include <netipsec/key_debug.h>
/* XXX IPCOMP */
-#define M_IPSEC (M_AUTHIPHDR|M_AUTHIPDGM|M_DECRYPTED)
+#define M_IPSEC (M_AUTHIPHDR|M_DECRYPTED)
int ipip_spoofcheck = 1;
percpu_t *ipipstat_percpu;
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.187 src/sys/sys/mbuf.h:1.188
--- src/sys/sys/mbuf.h:1.187 Sun Apr 15 17:26:39 2018
+++ src/sys/sys/mbuf.h Tue Apr 24 08:07:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.187 2018/04/15 17:26:39 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.188 2018/04/24 08:07:06 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -355,7 +355,6 @@ MBUF_DEFINE(mbuf, MHLEN, MLEN);
* IP header */
#define M_DECRYPTED 0x00000020 /* confidentiality */
#define M_LOOP 0x00000040 /* for Mbuf statistics */
-#define M_AUTHIPDGM 0x00000080 /* data origin authentication */
#define M_BCAST 0x00000100 /* send/received as link-level
* broadcast */
#define M_MCAST 0x00000200 /* send/received as link-level
@@ -387,7 +386,7 @@ MBUF_DEFINE(mbuf, MHLEN, MLEN);
#define M_NOTIFICATION M_PROTO1
#define M_FLAGS_BITS \
- "\20\1EXT\2PKTHDR\3EOR\4PROTO1\5AUTHIPHDR\6DECRYPTED\7LOOP\10AUTHIPDGM" \
+ "\20\1EXT\2PKTHDR\3EOR\4PROTO1\5AUTHIPHDR\6DECRYPTED\7LOOP\10NONE" \
"\11BCAST\12MCAST\13CANFASTFWD\14ANYCAST6\15LINK0\16LINK1\17LINK2\20LINK3" \
"\21LINK4\22LINK5\23LINK6\24LINK7" \
"\25VLANTAG" \
@@ -396,7 +395,7 @@ MBUF_DEFINE(mbuf, MHLEN, MLEN);
/* flags copied when copying m_pkthdr */
#define M_COPYFLAGS (M_PKTHDR|M_EOR|M_BCAST|M_MCAST|M_CANFASTFWD| \
M_ANYCAST6|M_LINK0|M_LINK1|M_LINK2|M_AUTHIPHDR|M_DECRYPTED|M_LOOP| \
- M_AUTHIPDGM|M_VLANTAG)
+ M_VLANTAG)
/* flag copied when shallow-copying external storage */
#define M_EXTCOPYFLAGS (M_EXT|M_EXT_FLAGS)
