[src/trunk]: src/sys/netipsec Remove ip4_esp_randpad and ip6_esp_randpad, unu...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c79e3dd8919
branches:  trunk
changeset: 829878:3c79e3dd8919
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Feb 16 08:51:28 2018 +0000

description:
Remove ip4_esp_randpad and ip6_esp_randpad, unused. Discussed with
ozaki-r@.

diffstat:

 sys/netipsec/ipsec.c  |  15 ++-------------
 sys/netipsec/ipsec.h  |   3 +--
 sys/netipsec/ipsec6.h |   3 +--
 3 files changed, 4 insertions(+), 17 deletions(-)

diffs (84 lines):

diff -r 4c92857d173e -r 3c79e3dd8919 sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Fri Feb 16 08:42:45 2018 +0000
+++ b/sys/netipsec/ipsec.c      Fri Feb 16 08:51:28 2018 +0000
@@ -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_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 @@
 
 #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_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 *);
diff -r 4c92857d173e -r 3c79e3dd8919 sys/netipsec/ipsec.h
--- a/sys/netipsec/ipsec.h      Fri Feb 16 08:42:45 2018 +0000
+++ b/sys/netipsec/ipsec.h      Fri Feb 16 08:51:28 2018 +0000
@@ -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_offsetmask;
 extern int ip4_ipsec_dfbit;
 extern int ip4_ipsec_ecn;
-extern int ip4_esp_randpad;
 extern int crypto_support;
 
 #include <sys/syslog.h>
diff -r 4c92857d173e -r 3c79e3dd8919 sys/netipsec/ipsec6.h
--- a/sys/netipsec/ipsec6.h     Fri Feb 16 08:42:45 2018 +0000
+++ b/sys/netipsec/ipsec6.h     Fri Feb 16 08:51:28 2018 +0000
@@ -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_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;