be aware of "tunnel"

8 files changed, 52 insertions, 52 deletions

diff --git a/regress/sbin/ipsecctl/sa1.ok b/regress/sbin/ipsecctl/sa1.ok
index 49d94ea582f..083708a160a 100644
--- a/regress/sbin/ipsecctl/sa1.ok
+++ b/regress/sbin/ipsecctl/sa1.ok
@@ -1,6 +1,6 @@
-esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa2.ok b/regress/sbin/ipsecctl/sa2.ok
index 3256d18bc17..484a8259a53 100644
--- a/regress/sbin/ipsecctl/sa2.ok
+++ b/regress/sbin/ipsecctl/sa2.ok
@@ -1,6 +1,6 @@
-esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha1 enc aes
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha1 enc aes
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa3.ok b/regress/sbin/ipsecctl/sa3.ok
index 49d94ea582f..083708a160a 100644
--- a/regress/sbin/ipsecctl/sa3.ok
+++ b/regress/sbin/ipsecctl/sa3.ok
@@ -1,6 +1,6 @@
-esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa4.ok b/regress/sbin/ipsecctl/sa4.ok
index 3256d18bc17..484a8259a53 100644
--- a/regress/sbin/ipsecctl/sa4.ok
+++ b/regress/sbin/ipsecctl/sa4.ok
@@ -1,6 +1,6 @@
-esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha1 enc aes
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha1 enc aes
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa5.ok b/regress/sbin/ipsecctl/sa5.ok
index 92263c88531..97ec3bcae7b 100644
--- a/regress/sbin/ipsecctl/sa5.ok
+++ b/regress/sbin/ipsecctl/sa5.ok
@@ -1,36 +1,36 @@
-ah from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef auth hmac-sha2-256
+ah tunnel from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef auth hmac-sha2-256
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.1 spi 0xbeef1ead auth hmac-sha2-256
+ah tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeef1ead auth hmac-sha2-256
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef auth hmac-md5
+ah tunnel from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef auth hmac-md5
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.2 spi 0xbeef2ead auth hmac-md5
+ah tunnel from 2.2.2.2 to 1.1.1.2 spi 0xbeef2ead auth hmac-md5
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef auth hmac-ripemd160
+ah tunnel from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef auth hmac-ripemd160
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.3 spi 0xbeef3ead auth hmac-ripemd160
+ah tunnel from 2.2.2.2 to 1.1.1.3 spi 0xbeef3ead auth hmac-ripemd160
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef auth hmac-sha1
+ah tunnel from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef auth hmac-sha1
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.4 spi 0xbeef4ead auth hmac-sha1
+ah tunnel from 2.2.2.2 to 1.1.1.4 spi 0xbeef4ead auth hmac-sha1
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef auth hmac-sha2-256
+ah tunnel from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef auth hmac-sha2-256
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha2-256
+ah tunnel from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha2-256
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha2-384
+ah tunnel from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha2-384
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha2-384
+ah tunnel from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha2-384
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha2-512
+ah tunnel from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha2-512
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.7 spi 0xbeef7ead auth hmac-sha2-512
+ah tunnel from 2.2.2.2 to 1.1.1.7 spi 0xbeef7ead auth hmac-sha2-512
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth md5
+ah tunnel from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth md5
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth md5
+ah tunnel from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth md5
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth sha1
+ah tunnel from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth sha1
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ah from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth sha1
+ah tunnel from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth sha1
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/regress/sbin/ipsecctl/sa6.ok b/regress/sbin/ipsecctl/sa6.ok
index 2c34597fd27..fb7f3253c2e 100644
--- a/regress/sbin/ipsecctl/sa6.ok
+++ b/regress/sbin/ipsecctl/sa6.ok
@@ -1,52 +1,52 @@
-esp from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef auth hmac-sha2-256 enc aesctr
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.1 spi 0xbeef1ead auth hmac-sha2-256 enc aesctr
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeef1ead auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef auth hmac-sha1 enc 3des-cbc
+esp tunnel from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef auth hmac-sha1 enc 3des-cbc
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.2 spi 0xbeef2ead auth hmac-sha1 enc 3des-cbc
+esp tunnel from 2.2.2.2 to 1.1.1.2 spi 0xbeef2ead auth hmac-sha1 enc 3des-cbc
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef auth hmac-sha1 enc des-cbc
+esp tunnel from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef auth hmac-sha1 enc des-cbc
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.3 spi 0xbeef3ead auth hmac-sha1 enc des-cbc
+esp tunnel from 2.2.2.2 to 1.1.1.3 spi 0xbeef3ead auth hmac-sha1 enc des-cbc
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeee
-esp from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef auth hmac-sha1 enc aes
+esp tunnel from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.4 spi 0xbeef4ead auth hmac-sha1 enc aes
+esp tunnel from 2.2.2.2 to 1.1.1.4 spi 0xbeef4ead auth hmac-sha1 enc aes
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef auth hmac-sha1 enc aesctr
+esp tunnel from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef auth hmac-sha1 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha1 enc aesctr
+esp tunnel from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha1 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha1 enc blowfish
+esp tunnel from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha1 enc blowfish
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha1 enc blowfish
+esp tunnel from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha1 enc blowfish
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha1 enc cast128
+esp tunnel from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha1 enc cast128
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.7 spi 0xbeef7ead auth hmac-sha1 enc cast128
+esp tunnel from 2.2.2.2 to 1.1.1.7 spi 0xbeef7ead auth hmac-sha1 enc cast128
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null
+esp tunnel from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null
+esp tunnel from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack
+esp tunnel from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack
+esp tunnel from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa7.ok b/regress/sbin/ipsecctl/sa7.ok
index 9ae6d4ab760..2db42eddb3d 100644
--- a/regress/sbin/ipsecctl/sa7.ok
+++ b/regress/sbin/ipsecctl/sa7.ok
@@ -1,6 +1,6 @@
-esp from 1.1.1.1 to 0.0.0.0/0 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
+esp tunnel from 1.1.1.1 to 0.0.0.0/0 spi 0xdeadbeef auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-esp from 0.0.0.0/0 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
+esp tunnel from 0.0.0.0/0 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aesctr
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa8.ok b/regress/sbin/ipsecctl/sa8.ok
index b84b110407a..faab801084c 100644
--- a/regress/sbin/ipsecctl/sa8.ok
+++ b/regress/sbin/ipsecctl/sa8.ok
@@ -1,6 +1,6 @@
-ipcomp from 1.1.1.1 to 2.2.2.2 spi 0x00001000 comp deflate
-ipcomp from 2.2.2.2 to 1.1.1.1 spi 0x00001001 comp deflate
-ipcomp from 3.3.3.3 to 4.4.4.4 spi 0x00002000 comp deflate
-ipcomp from 4.4.4.4 to 3.3.3.3 spi 0x00002001 comp deflate
-ipcomp from 5.5.5.5 to 6.6.6.6 spi 0x00003000 comp lzs
-ipcomp from 6.6.6.6 to 5.5.5.5 spi 0x00003001 comp lzs
+ipcomp tunnel from 1.1.1.1 to 2.2.2.2 spi 0x00001000 comp deflate
+ipcomp tunnel from 2.2.2.2 to 1.1.1.1 spi 0x00001001 comp deflate
+ipcomp tunnel from 3.3.3.3 to 4.4.4.4 spi 0x00002000 comp deflate
+ipcomp tunnel from 4.4.4.4 to 3.3.3.3 spi 0x00002001 comp deflate
+ipcomp tunnel from 5.5.5.5 to 6.6.6.6 spi 0x00003000 comp lzs
+ipcomp tunnel from 6.6.6.6 to 5.5.5.5 spi 0x00003001 comp lzs