MFC r304572 (by bz):

  Remove the kernel optoion for IPSEC_FILTERTUNNEL, which was deprecated
  more than 7 years ago in favour of a sysctl in r192648.

MFC r305122:
  Remove redundant sanity checks from ipsec[46]_common_input_cb().

  This check already has been done in the each protocol callback.

MFC r309144,309174,309201 (by fabient):
  IPsec RFC6479 support for replay window sizes up to 2^32 - 32 packets.

  Since the previous algorithm, based on bit shifting, does not scale
  with large replay windows, the algorithm used here is based on
  RFC 6479: IPsec Anti-Replay Algorithm without Bit Shifting.
  The replay window will be fast to be updated, but will cost as many bits
  in RAM as its size.

  The previous implementation did not provide a lock on the replay window,
  which may lead to replay issues.

  Obtained from:	emeric.poupon@stormshield.eu
  Sponsored by:	Stormshield
  Differential Revision:	https://reviews.freebsd.org/D8468

MFC r309143,309146 (by fabient):
  In a dual processor system (2*6 cores) during IPSec throughput tests,
  we see a lot of contention on the arc4 lock, used to generate the IV
  of the ESP output packets.

  The idea of this patch is to split this mutex in order to reduce the
  contention on this lock.

  Update r309143 to prevent false sharing.

  Reviewed by:	delphij, markm, ache
  Approved by:	so
  Obtained from: emeric.poupon@stormshield.eu
  Sponsored by:	Stormshield
  Differential Revision:	https://reviews.freebsd.org/D8130

MFC r313330:
  Merge projects/ipsec into head/.

   Small summary
   -------------

  o Almost all IPsec releated code was moved into sys/netipsec.
  o New kernel modules added: ipsec.ko and tcpmd5.ko. New kernel
    option IPSEC_SUPPORT added. It enables support for loading
    and unloading of ipsec.ko and tcpmd5.ko kernel modules.
  o IPSEC_NAT_T option was removed. Now NAT-T support is enabled by
    default. The UDP_ENCAP_ESPINUDP_NON_IKE encapsulation type
    support was removed. Added TCP/UDP checksum handling for
    inbound packets that were decapsulated by transport mode SAs.
    setkey(8) modified to show run-time NAT-T configuration of SA.
  o New network pseudo interface if_ipsec(4) added. For now it is
    build as part of ipsec.ko module (or with IPSEC kernel).
    It implements IPsec virtual tunnels to create route-based VPNs.
  o The network stack now invokes IPsec functions using special
    methods. The only one header file <netipsec/ipsec_support.h>
    should be included to declare all the needed things to work
    with IPsec.
  o All IPsec protocols handlers (ESP/AH/IPCOMP protosw) were removed.
    Now these protocols are handled directly via IPsec methods.
  o TCP_SIGNATURE support was reworked to be more close to RFC.
  o PF_KEY SADB was reworked:
    - now all security associations stored in the single SPI namespace,
      and all SAs MUST have unique SPI.
    - several hash tables added to speed up lookups in SADB.
    - SADB now uses rmlock to protect access, and concurrent threads
      can do SA lookups in the same time.
    - many PF_KEY message handlers were reworked to reflect changes
      in SADB.
    - SADB_UPDATE message was extended to support new PF_KEY headers:
      SADB_X_EXT_NEW_ADDRESS_SRC and SADB_X_EXT_NEW_ADDRESS_DST. They
      can be used by IKE daemon to change SA addresses.
  o ipsecrequest and secpolicy structures were cardinally changed to
    avoid locking protection for ipsecrequest. Now we support
    only limited number (4) of bundled SAs, but they are supported
    for both INET and INET6.
  o INPCB security policy cache was introduced. Each PCB now caches
    used security policies to avoid SP lookup for each packet.
  o For inbound security policies added the mode, when the kernel does
    check for full history of applied IPsec transforms.
  o References counting rules for security policies and security
    associations were changed. The proper SA locking added into xform
    code.
  o xform code was also changed. Now it is possible to unregister xforms.
    tdb_xxx structures were changed and renamed to reflect changes in
    SADB/SPDB, and changed rules for locking and refcounting.

  Obtained from:	Yandex LLC
  Relnotes:	yes
  Sponsored by:	Yandex LLC
  Differential Revision:	https://reviews.freebsd.org/D9352

MFC r313331:
  Add removed headers into the ObsoleteFiles.inc.

MFC r313561 (by glebius):
  Move tcp_fields_to_net() static inline into tcp_var.h, just below its
  friend tcp_fields_to_host(). There is third party code that also uses
  this inline.

MFC r313697:
  Remove IPsec related PCB code from SCTP.

  The inpcb structure has inp_sp pointer that is initialized by
  ipsec_init_pcbpolicy() function. This pointer keeps strorage for IPsec
  security policies associated with a specific socket.
  An application can use IP_IPSEC_POLICY and IPV6_IPSEC_POLICY socket
  options to configure these security policies. Then ip[6]_output()
  uses inpcb pointer to specify that an outgoing packet is associated
  with some socket. And IPSEC_OUTPUT() method can use a security policy
  stored in the inp_sp. For inbound packet the protocol-specific input
  routine uses IPSEC_CHECK_POLICY() method to check that a packet conforms
  to inbound security policy configured in the inpcb.

  SCTP protocol doesn't specify inpcb for ip[6]_output() when it sends
  packets. Thus IPSEC_OUTPUT() method does not consider such packets as
  associated with some socket and can not apply security policies
  from inpcb, even if they are configured. Since IPSEC_CHECK_POLICY()
  method is called from protocol-specific input routine, it can specify
  inpcb pointer and associated with socket inbound policy will be
  checked. But there are two problems:
  1. Such check is asymmetric, becasue we can not apply security policy
  from inpcb for outgoing packet.
  2. IPSEC_CHECK_POLICY() expects that caller holds INPCB lock and
  access to inp_sp is protected. But for SCTP this is not correct,
  becasue SCTP uses own locks to protect inpcb.

  To fix these problems remove IPsec related PCB code from SCTP.
  This imply that IP_IPSEC_POLICY and IPV6_IPSEC_POLICY socket options
  will be not applicable to SCTP sockets. To be able correctly check
  inbound security policies for SCTP, mark its protocol header with
  the PR_LASTHDR flag.

  Differential Revision:	https://reviews.freebsd.org/D9538

MFC r313746:
  Add missing check to fix the build with IPSEC_SUPPORT and without MAC.

MFC r313805:
  Fix LINT build for powerpc.

  Build kernel modules support only when both IPSEC and TCP_SIGNATURE
  are not defined.

MFC r313922:
  For translated packets do not adjust UDP checksum if it is zero.

  In case when decrypted and decapsulated packet is an UDP datagram,
  check that its checksum is not zero before doing incremental checksum
  adjustment.

MFC r314339:
  Document that the size of AH ICV for HMAC-SHA2-NNN should be half of
  NNN bits as described in RFC4868.

  PR:		215978

MFC r314812:
  Introduce the concept of IPsec security policies scope.

  Currently are defined three scopes: global, ifnet, and pcb.
  Generic security policies that IKE daemon can add via PF_KEY interface
  or an administrator creates with setkey(8) utility have GLOBAL scope.
  Such policies can be applied by the kernel to outgoing packets and checked
  agains inbound packets after IPsec processing.
  Security policies created by if_ipsec(4) interfaces have IFNET scope.
  Such policies are applied to packets that are passed through if_ipsec(4)
  interface.
  And security policies created by application using setsockopt()
  IP_IPSEC_POLICY option have PCB scope. Such policies are applied to
  packets related to specific socket. Currently there is no way to list
  PCB policies via setkey(8) utility.

  Modify setkey(8) and libipsec(3) to be able distinguish the scope of
  security policies in the `setkey -DP` listing. Add two optional flags:
  '-t' to list only policies related to virtual *tunneling* interfaces,
  i.e. policies with IFNET scope, and '-g' to list only policies with GLOBAL
  scope. By default policies from all scopes are listed.

  To implement this PF_KEY's sadb_x_policy structure was modified.
  sadb_x_policy_reserved field is used to pass the policy scope from the
  kernel to userland. SADB_SPDDUMP message extended to support filtering
  by scope: sadb_msg_satype field is used to specify bit mask of requested
  scopes.

  For IFNET policies the sadb_x_policy_priority field of struct sadb_x_policy
  is used to pass if_ipsec's interface if_index to the userland. For GLOBAL
  policies sadb_x_policy_priority is used only to manage order of security
  policies in the SPDB. For IFNET policies it is not used, so it can be used
  to keep if_index.

  After this change the output of `setkey -DP` now looks like:
  # setkey -DPt
  0.0.0.0/0[any] 0.0.0.0/0[any] any
  	in ipsec
  	esp/tunnel/87.250.242.144-87.250.242.145/unique:145
  	spid=7 seq=3 pid=58025 scope=ifnet ifname=ipsec0
  	refcnt=1
  # setkey -DPg
  ::/0 ::/0 icmp6 135,0
  	out none
  	spid=5 seq=1 pid=872 scope=global
  	refcnt=1

  Obtained from:	Yandex LLC
  Sponsored by:	Yandex LLC
  Differential Revision:	https://reviews.freebsd.org/D9805

PR:		212018
Relnotes:	yes
Sponsored by:	Yandex LLC

5 files changed, 140 insertions, 30 deletions

diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index a3623d5..5433926 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -34,6 +34,7 @@ SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
 SRCS+=	ifvxlan.c		# VXLAN support
 SRCS+=	ifgre.c			# GRE keys etc
 SRCS+=	ifgif.c			# GIF reversed header workaround
+SRCS+=	ifipsec.c		# IPsec VTI
 
 SRCS+=	sfp.c			# SFP/SFP+ information
 LIBADD+=	m
diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c
new file mode 100644
index 0000000..fed5a84
--- /dev/null
+++ b/sbin/ifconfig/ifipsec.c
@@ -0,0 +1,101 @@
+/*-
+ * Copyright (c) 2016 Yandex LLC
+ * Copyright (c) 2016 Andrey V. Elsukov <ae@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/stdint.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_ipsec.h>
+#include <net/route.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <err.h>
+#include <errno.h>
+
+#include "ifconfig.h"
+
+static void
+ipsec_status(int s)
+{
+	uint32_t reqid;
+
+	ifr.ifr_data = (caddr_t)&reqid;
+	if (ioctl(s, IPSECGREQID, &ifr) == -1)
+		return;
+	printf("\treqid: %u\n", reqid);
+}
+
+static
+DECL_CMD_FUNC(setreqid, val, arg)
+{
+	char *ep;
+	uint32_t v;
+
+	v = strtoul(val, &ep, 0);
+	if (*ep != '\0') {
+		warn("Invalid reqid value %s", val);
+		return;
+	}
+	ifr.ifr_data = (char *)&v;
+	if (ioctl(s, IPSECSREQID, &ifr) == -1) {
+		warn("ioctl(IPSECSREQID)");
+		return;
+	}
+}
+
+static struct cmd ipsec_cmds[] = {
+	DEF_CMD_ARG("reqid",		setreqid),
+};
+
+static struct afswtch af_ipsec = {
+	.af_name	= "af_ipsec",
+	.af_af		= AF_UNSPEC,
+	.af_other_status = ipsec_status,
+};
+
+static __constructor void
+ipsec_ctor(void)
+{
+	size_t i;
+
+	for (i = 0; i < nitems(ipsec_cmds); i++)
+		cmd_register(&ipsec_cmds[i]);
+	af_register(&af_ipsec);
+#undef N
+}
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index ce8823f..0d26dca 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1518,8 +1518,7 @@ Matches IPv4 packets whose precedence field is equal to
 .It Cm ipsec
 Matches packets that have IPSEC history associated with them
 (i.e., the packet comes encapsulated in IPSEC, the kernel
-has IPSEC support and IPSEC_FILTERTUNNEL option, and can correctly
-decapsulate it).
+has IPSEC support, and can correctly decapsulate it).
 .Pp
 Note that specifying
 .Cm ipsec
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 1eab814..afaa753 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 3, 2016
+.Dd March 7, 2017
 .Dt SETKEY 8
 .Os
 .\"
@@ -45,7 +45,7 @@
 .Op Fl v
 .Fl f Ar filename
 .Nm
-.Op Fl aPlv
+.Op Fl Pgltv
 .Fl D
 .Nm
 .Op Fl Pv
@@ -81,18 +81,21 @@ Flush the SAD entries.
 If with
 .Fl P ,
 the SPD entries are flushed.
-.It Fl a
-The
-.Nm
-utility
-usually does not display dead SAD entries with
-.Fl D .
-If with
-.Fl a ,
-the dead SAD entries will be displayed as well.
-A dead SAD entry means that
-it has been expired but remains in the system
-because it is referenced by some SPD entries.
+.It Fl g
+Only SPD entries with global scope are dumped with
+.Fl D
+and
+.Fl P
+flags.
+.It Fl t
+Only SPD entries with ifnet scope are dumped with
+.Fl D
+and
+.Fl P
+flags.
+Such SPD entries are linked to the corresponding
+.Xr if_ipsec 4
+virtual tunneling interface.
 .It Fl h
 Add hexadecimal dump on
 .Fl x
@@ -270,8 +273,6 @@ must be a decimal number, or a hexadecimal number with
 prefix.
 SPI values between 0 and 255 are reserved for future use by IANA
 and they cannot be used.
-TCP-MD5 associations must use 0x1000 and therefore only have per-host
-granularity at this time.
 .\"
 .Pp
 .It Ar extensions
@@ -595,12 +596,11 @@ keyed-md5	128		ah: 96bit ICV (no document)
 keyed-sha1	160		ah: 96bit ICV (no document)
 		160		ah-old: 128bit ICV (no document)
 null		0 to 2048	for debugging
-hmac-sha2-256	256		ah: 96bit ICV
-				(draft-ietf-ipsec-ciph-sha-256-00)
+hmac-sha2-256	256		ah: 128bit ICV (RFC4868)
 		256		ah-old: 128bit ICV (no document)
-hmac-sha2-384	384		ah: 96bit ICV (no document)
+hmac-sha2-384	384		ah: 192bit ICV (RFC4868)
 		384		ah-old: 128bit ICV (no document)
-hmac-sha2-512	512		ah: 96bit ICV (no document)
+hmac-sha2-512	512		ah: 256bit ICV (RFC4868)
 		512		ah-old: 128bit ICV (no document)
 hmac-ripemd160	160		ah: 96bit ICV (RFC2857)
 				ah-old: 128bit ICV (no document)
@@ -700,6 +700,7 @@ add 10.1.10.34 10.1.10.36 tcp 0x1000 -A tcp-md5 "TCP-MD5 BGP secret" ;
 .\"
 .Sh SEE ALSO
 .Xr ipsec_set_policy 3 ,
+.Xr if_ipsec 4 ,
 .Xr racoon 8 ,
 .Xr sysctl 8
 .Rs
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index 543f428..e4525ee 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -56,7 +56,7 @@
 void usage(void);
 int main(int, char **);
 int get_supported(void);
-void sendkeyshort(u_int);
+void sendkeyshort(u_int, uint8_t);
 void promisc(void);
 int sendkeymsg(char *, size_t);
 int postproc(struct sadb_msg *, int);
@@ -81,6 +81,7 @@ int f_cmddump = 0;
 int f_policy = 0;
 int f_hexdump = 0;
 int f_tflag = 0;
+int f_scope = 0;
 static time_t thiszone;
 
 extern int lineno;
@@ -93,7 +94,7 @@ usage()
 
 	printf("usage: setkey [-v] -c\n");
 	printf("       setkey [-v] -f filename\n");
-	printf("       setkey [-Palv] -D\n");
+	printf("       setkey [-Pagltv] -D\n");
 	printf("       setkey [-Pv] -F\n");
 	printf("       setkey [-h] -x\n");
 	exit(1);
@@ -114,7 +115,7 @@ main(ac, av)
 
 	thiszone = gmt2local(0);
 
-	while ((c = getopt(ac, av, "acdf:hlvxDFP")) != -1) {
+	while ((c = getopt(ac, av, "acdf:ghltvxDFP")) != -1) {
 		switch (c) {
 		case 'c':
 			f_mode = MODE_SCRIPT;
@@ -149,6 +150,12 @@ main(ac, av)
 		case 'P':
 			f_policy = 1;
 			break;
+		case 'g': /* global */
+			f_scope |= IPSEC_POLICYSCOPE_GLOBAL;
+			break;
+		case 't': /* tunnel */
+			f_scope |= IPSEC_POLICYSCOPE_IFNET;
+			break;
 		case 'v':
 			f_verbose = 1;
 			break;
@@ -166,10 +173,12 @@ main(ac, av)
 
 	switch (f_mode) {
 	case MODE_CMDDUMP:
-		sendkeyshort(f_policy ? SADB_X_SPDDUMP: SADB_DUMP);
+		sendkeyshort(f_policy ? SADB_X_SPDDUMP: SADB_DUMP,
+		    f_policy ? f_scope: SADB_SATYPE_UNSPEC);
 		break;
 	case MODE_CMDFLUSH:
-		sendkeyshort(f_policy ? SADB_X_SPDFLUSH: SADB_FLUSH);
+		sendkeyshort(f_policy ? SADB_X_SPDFLUSH: SADB_FLUSH,
+		    SADB_SATYPE_UNSPEC);
 		break;
 	case MODE_SCRIPT:
 		if (get_supported() < 0) {
@@ -204,15 +213,14 @@ get_supported()
 }
 
 void
-sendkeyshort(type)
-        u_int type;
+sendkeyshort(u_int type, uint8_t satype)
 {
 	struct sadb_msg msg;
 
 	msg.sadb_msg_version = PF_KEY_V2;
 	msg.sadb_msg_type = type;
 	msg.sadb_msg_errno = 0;
-	msg.sadb_msg_satype = SADB_SATYPE_UNSPEC;
+	msg.sadb_msg_satype = satype;
 	msg.sadb_msg_len = PFKEY_UNIT64(sizeof(msg));
 	msg.sadb_msg_reserved = 0;
 	msg.sadb_msg_seq = 0;