diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-04-19 16:06:38 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-04-19 16:06:38 +0000 |
| commit | 736c272be731adb9b967dc9927c20c58cf36d978 (patch) | |
| tree | 05ce9408ba43f04778ae10b610de1a96efbe87bd | |
| parent | Rename all SA groups to bundles consistently. The first kernel (diff) | |
| download | wireguard-openbsd-736c272be731adb9b967dc9927c20c58cf36d978.tar.xz wireguard-openbsd-736c272be731adb9b967dc9927c20c58cf36d978.zip | |
SA group has been renamed to bundle. Adapt test.
| -rw-r--r-- | regress/sbin/ipsecctl/sa25.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa26.ok | 12 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa27.ok | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/regress/sbin/ipsecctl/sa25.ok b/regress/sbin/ipsecctl/sa25.ok index 7a9b2aa2d2a..6c1a91ffedb 100644 --- a/regress/sbin/ipsecctl/sa25.ok +++ b/regress/sbin/ipsecctl/sa25.ok @@ -6,10 +6,10 @@ esp transport from 2.2.2.2 to 1.1.1.1 spi 0x1b000000 auth hmac-sha2-256 enc aes enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee ah transport from 1.1.1.1 to 2.2.2.2 spi 0x2a000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group esp to 2.2.2.2 spi 0x1a000000 with ah to 2.2.2.2 spi 0x2a000000] +[bundle esp to 2.2.2.2 spi 0x1a000000 with ah to 2.2.2.2 spi 0x2a000000] ah transport from 2.2.2.2 to 1.1.1.1 spi 0x2b000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group esp to 1.1.1.1 spi 0x1b000000 with ah to 1.1.1.1 spi 0x2b000000] +[bundle esp to 1.1.1.1 spi 0x1b000000 with ah to 1.1.1.1 spi 0x2b000000] ah transport from 3.3.3.3 to 2.2.2.2 spi 0x3a000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ah transport from 2.2.2.2 to 3.3.3.3 spi 0x3b000000 auth hmac-sha2-256 \ diff --git a/regress/sbin/ipsecctl/sa26.ok b/regress/sbin/ipsecctl/sa26.ok index 9a70a502dcc..d44ff72ceb9 100644 --- a/regress/sbin/ipsecctl/sa26.ok +++ b/regress/sbin/ipsecctl/sa26.ok @@ -1,20 +1,20 @@ ipip from 1.1.1.1 to 2.2.2.2 spi 0x1a000000 ipip from 2.2.2.2 to 1.1.1.1 spi 0x1b000000 ipcomp transport from 1.1.1.1 to 2.2.2.2 spi 0x00002a00 comp deflate -[group ipip to 2.2.2.2 spi 0x1a000000 with ipcomp to 2.2.2.2 spi 0x00002a00] +[bundle ipip to 2.2.2.2 spi 0x1a000000 with ipcomp to 2.2.2.2 spi 0x00002a00] ipcomp transport from 2.2.2.2 to 1.1.1.1 spi 0x00002b00 comp deflate -[group ipip to 1.1.1.1 spi 0x1b000000 with ipcomp to 1.1.1.1 spi 0x00002b00] +[bundle ipip to 1.1.1.1 spi 0x1b000000 with ipcomp to 1.1.1.1 spi 0x00002b00] esp transport from 1.1.1.1 to 2.2.2.2 spi 0x3a000000 auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee -[group ipcomp to 2.2.2.2 spi 0x00002a00 with esp to 2.2.2.2 spi 0x3a000000] +[bundle ipcomp to 2.2.2.2 spi 0x00002a00 with esp to 2.2.2.2 spi 0x3a000000] esp transport from 2.2.2.2 to 1.1.1.1 spi 0x3b000000 auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee -[group ipcomp to 1.1.1.1 spi 0x00002b00 with esp to 1.1.1.1 spi 0x3b000000] +[bundle ipcomp to 1.1.1.1 spi 0x00002b00 with esp to 1.1.1.1 spi 0x3b000000] ah transport from 1.1.1.1 to 2.2.2.2 spi 0x4a000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group esp to 2.2.2.2 spi 0x3a000000 with ah to 2.2.2.2 spi 0x4a000000] +[bundle esp to 2.2.2.2 spi 0x3a000000 with ah to 2.2.2.2 spi 0x4a000000] ah transport from 2.2.2.2 to 1.1.1.1 spi 0x4b000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group esp to 1.1.1.1 spi 0x3b000000 with ah to 1.1.1.1 spi 0x4b000000] +[bundle esp to 1.1.1.1 spi 0x3b000000 with ah to 1.1.1.1 spi 0x4b000000] diff --git a/regress/sbin/ipsecctl/sa27.ok b/regress/sbin/ipsecctl/sa27.ok index 9e9a38aecba..a6777fbac14 100644 --- a/regress/sbin/ipsecctl/sa27.ok +++ b/regress/sbin/ipsecctl/sa27.ok @@ -5,14 +5,14 @@ ipcomp transport from 2.2.2.2 to 1.1.1.1 spi 0x00002b00 comp deflate esp transport from 1.1.1.1 to 2.2.2.2 spi 0x3a000000 auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee -[group ipip to 2.2.2.2 spi 0x1a000000 with esp to 2.2.2.2 spi 0x3a000000] +[bundle ipip to 2.2.2.2 spi 0x1a000000 with esp to 2.2.2.2 spi 0x3a000000] esp transport from 2.2.2.2 to 1.1.1.1 spi 0x3b000000 auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee -[group ipip to 1.1.1.1 spi 0x1b000000 with esp to 1.1.1.1 spi 0x3b000000] +[bundle ipip to 1.1.1.1 spi 0x1b000000 with esp to 1.1.1.1 spi 0x3b000000] ah transport from 1.1.1.1 to 2.2.2.2 spi 0x4a000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group ipcomp to 2.2.2.2 spi 0x00002a00 with ah to 2.2.2.2 spi 0x4a000000] +[bundle ipcomp to 2.2.2.2 spi 0x00002a00 with ah to 2.2.2.2 spi 0x4a000000] ah transport from 2.2.2.2 to 1.1.1.1 spi 0x4b000000 auth hmac-sha2-256 \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -[group ipcomp to 1.1.1.1 spi 0x00002b00 with ah to 1.1.1.1 spi 0x4b000000] +[bundle ipcomp to 1.1.1.1 spi 0x00002b00 with ah to 1.1.1.1 spi 0x4b000000] |