Module Name: src
Committed By: maxv
Date: Fri Feb 16 08:51:28 UTC 2018
Modified Files:
src/sys/netipsec: ipsec.c ipsec.h ipsec6.h
Log Message:
Remove ip4_esp_randpad and ip6_esp_randpad, unused. Discussed with
ozaki-r@.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.20 -r1.21 src/sys/netipsec/ipsec6.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.125 src/sys/netipsec/ipsec.c:1.126
--- src/sys/netipsec/ipsec.c:1.125 Thu Feb 8 20:57:41 2018
+++ src/sys/netipsec/ipsec.c Fri Feb 16 08:51:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.125 2018/02/08 20:57:41 maxv Exp $ */
+/* $NetBSD: ipsec.c,v 1.126 2018/02/16 08:51:28 maxv Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.125 2018/02/08 20:57:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.126 2018/02/16 08:51:28 maxv Exp $");
/*
* IPsec controller part.
@@ -133,7 +133,6 @@ int ip4_ah_trans_deflev = IPSEC_LEVEL_US
int ip4_ah_net_deflev = IPSEC_LEVEL_USE;
struct secpolicy ip4_def_policy;
int ip4_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
-int ip4_esp_randpad = -1;
u_int ipsec_spdgen = 1; /* SPD generation # */
@@ -163,8 +162,6 @@ static struct secpolicy *ipsec_getpolicy
#ifdef __FreeBSD__
/* net.inet.ipsec */
-SYSCTL_INT(_net_inet_ipsec, IPSECCTL_ESP_RANDPAD,
- esp_randpad, CTLFLAG_RW, &ip4_esp_randpad, 0, "");
SYSCTL_INT(_net_inet_ipsec, OID_AUTO,
crypto_support, CTLFLAG_RW, &crypto_support,0, "");
SYSCTL_INT(_net_inet_ipsec, OID_AUTO, test_replay, CTLFLAG_RW, &ipsec_replay, 0,
@@ -180,14 +177,6 @@ int ip6_ah_trans_deflev = IPSEC_LEVEL_US
int ip6_ah_net_deflev = IPSEC_LEVEL_USE;
struct secpolicy ip6_def_policy;
int ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
-int ip6_esp_randpad = -1;
-
-
-#ifdef __FreeBSD__
-/* net.inet6.ipsec6 */
-SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ESP_RANDPAD,
- esp_randpad, CTLFLAG_RW, &ip6_esp_randpad, 0, "");
-#endif /* __FreeBSD__ */
#endif /* INET6 */
static int ipsec4_setspidx_inpcb (struct mbuf *, struct inpcb *);
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.64 src/sys/netipsec/ipsec.h:1.65
--- src/sys/netipsec/ipsec.h:1.64 Wed Feb 14 14:28:40 2018
+++ src/sys/netipsec/ipsec.h Fri Feb 16 08:51:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.64 2018/02/14 14:28:40 maxv Exp $ */
+/* $NetBSD: ipsec.h,v 1.65 2018/02/16 08:51:28 maxv Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -253,7 +253,6 @@ extern int ip4_ah_cleartos;
extern int ip4_ah_offsetmask;
extern int ip4_ipsec_dfbit;
extern int ip4_ipsec_ecn;
-extern int ip4_esp_randpad;
extern int crypto_support;
#include <sys/syslog.h>
Index: src/sys/netipsec/ipsec6.h
diff -u src/sys/netipsec/ipsec6.h:1.20 src/sys/netipsec/ipsec6.h:1.21
--- src/sys/netipsec/ipsec6.h:1.20 Tue Oct 3 08:56:52 2017
+++ src/sys/netipsec/ipsec6.h Fri Feb 16 08:51:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec6.h,v 1.20 2017/10/03 08:56:52 ozaki-r Exp $ */
+/* $NetBSD: ipsec6.h,v 1.21 2018/02/16 08:51:28 maxv Exp $ */
/* $FreeBSD: src/sys/netipsec/ipsec6.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */
@@ -48,7 +48,6 @@ extern int ip6_esp_net_deflev;
extern int ip6_ah_trans_deflev;
extern int ip6_ah_net_deflev;
extern int ip6_ipsec_ecn;
-extern int ip6_esp_randpad;
extern struct secpolicy ip6_def_policy;
struct inpcb;
