summaryrefslogtreecommitdiff
path: root/sys/netipsec
diff options
context:
space:
mode:
authorknakahara <knakahara@NetBSD.org>2022-08-09 08:03:22 +0000
committerknakahara <knakahara@NetBSD.org>2022-08-09 08:03:22 +0000
commitdfd8b37edbd2f87cbe00f564d31431823ee87e6f (patch)
treed53c9b07a230c7bfaf92a1b2a68c724e498d1c88 /sys/netipsec
parent167cdf8056d89ca53f569e6f8fc2bb8997eec01e (diff)
Add sysctl entry to improve interconnectivity to some VPN appliances, pointed out by seil-team@IIJ.
If we want to allow different identifier types on IDii and IDir, set net.key.allow_different_idtype=1. Default(=0) is the same as before.
Diffstat (limited to 'sys/netipsec')
-rw-r--r--sys/netipsec/key.c19
-rw-r--r--sys/netipsec/key_var.h5
2 files changed, 19 insertions, 5 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 54f19859ad4..e74631e3532 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.275 2022/05/24 20:50:20 andvar Exp $ */
+/* $NetBSD: key.c,v 1.276 2022/08/09 08:03:22 knakahara Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.275 2022/05/24 20:50:20 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.276 2022/08/09 08:03:22 knakahara Exp $");
/*
* This code is referred to RFC 2367
@@ -534,6 +534,7 @@ static const int maxsize[] = {
static int ipsec_esp_keymin = 256;
static int ipsec_esp_auth = 0;
static int ipsec_ah_keymin = 128;
+static bool ipsec_allow_different_idtype = false;
#ifdef SYSCTL_DECL
SYSCTL_DECL(_net_key);
@@ -6171,7 +6172,14 @@ key_setident(struct secashead *sah, struct mbuf *m,
if (idsrc->sadb_ident_type != iddst->sadb_ident_type) {
IPSECLOG(LOG_DEBUG, "ident type mismatched src %u, dst %u.\n",
idsrc->sadb_ident_type, iddst->sadb_ident_type);
- return EINVAL;
+ /*
+ * Some VPN appliances(e.g. NetScreen) can send different
+ * identifier types on IDii and IDir, so be able to allow
+ * such message.
+ */
+ if (!ipsec_allow_different_idtype) {
+ return EINVAL;
+ }
}
switch (idsrc->sadb_ident_type) {
@@ -9034,6 +9042,11 @@ sysctl_net_keyv2_setup(struct sysctllog **clog)
SYSCTL_DESCR("PF_KEY statistics"),
sysctl_net_key_stats, 0, NULL, 0,
CTL_NET, IPSEC_PFKEY, CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_BOOL, "allow_different_idtype", NULL,
+ NULL, 0, &ipsec_allow_different_idtype, 0,
+ CTL_NET, IPSEC_PFKEY, KEYCTL_ALLOW_DIFFERENT_IDTYPE, CTL_EOL);
}
/*
diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h
index faca0a24446..b5575237484 100644
--- a/sys/netipsec/key_var.h
+++ b/sys/netipsec/key_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key_var.h,v 1.5 2018/04/28 13:23:17 maxv Exp $ */
+/* $NetBSD: key_var.h,v 1.6 2022/08/09 08:03:22 knakahara Exp $ */
/* $FreeBSD: key_var.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $ */
@@ -49,7 +49,8 @@
#define KEYCTL_PREFERED_OLDSA 12
#define KEYCTL_DUMPSA 13
#define KEYCTL_DUMPSP 14
-#define KEYCTL_MAXID 15
+#define KEYCTL_ALLOW_DIFFERENT_IDTYPE 15
+#define KEYCTL_MAXID 16
#ifdef _KERNEL
#define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))