diff options
| author |   hshoexer <hshoexer@openbsd.org> | 2007-03-14 09:06:00 +0000 |
|---|---|---|
| committer | hshoexer <hshoexer@openbsd.org> | 2007-03-14 09:06:00 +0000 |
| commit | c5aa1db0dc9fedcf934e0a1d4a8df8354eb8a5c4 (patch) | |
| tree | 728e4e7eca9f13cc6199eeb130f60af6fa0d0130 | |
| parent | Call ifp->if_start() at the end of the rx interrupt handling just in case (diff) | |
| download | wireguard-openbsd-c5aa1db0dc9fedcf934e0a1d4a8df8354eb8a5c4.tar.xz wireguard-openbsd-c5aa1db0dc9fedcf934e0a1d4a8df8354eb8a5c4.zip | |
We switched to aes cbc quite some time ago, so also use the correct
key sizes here, too. We now have to use 128 bit key instead of
160.
Noticed by david@
| -rw-r--r-- | regress/sbin/ipsecctl/sa1.in | 2 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa1.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa13.in | 2 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa13.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa15.in | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa15.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa19.in | 2 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa19.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa3.in | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa3.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa7.in | 2 | ||||
| -rw-r--r-- | regress/sbin/ipsecctl/sa7.ok | 4 |
12 files changed, 20 insertions, 20 deletions
diff --git a/regress/sbin/ipsecctl/sa1.in b/regress/sbin/ipsecctl/sa1.in index db6c7166dc2..020741610b3 100644 --- a/regress/sbin/ipsecctl/sa1.in +++ b/regress/sbin/ipsecctl/sa1.in @@ -1,3 +1,3 @@ esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef:0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa1.ok b/regress/sbin/ipsecctl/sa1.ok index 945780115ed..11b63147ae5 100644 --- a/regress/sbin/ipsecctl/sa1.ok +++ b/regress/sbin/ipsecctl/sa1.ok @@ -1,6 +1,6 @@ esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa13.in b/regress/sbin/ipsecctl/sa13.in index 7918698f2ef..912b5a58dd1 100644 --- a/regress/sbin/ipsecctl/sa13.in +++ b/regress/sbin/ipsecctl/sa13.in @@ -1,3 +1,3 @@ esp from 3ffe::1 to 3ffe::2 spi 0xdeadbeef:0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa13.ok b/regress/sbin/ipsecctl/sa13.ok index 56cc4a8d9af..0f75aea6fb5 100644 --- a/regress/sbin/ipsecctl/sa13.ok +++ b/regress/sbin/ipsecctl/sa13.ok @@ -1,6 +1,6 @@ esp tunnel from 3ffe::1 to 3ffe::2 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from 3ffe::2 to 3ffe::1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa15.in b/regress/sbin/ipsecctl/sa15.in index 350b7242c77..ff1ed307009 100644 --- a/regress/sbin/ipsecctl/sa15.in +++ b/regress/sbin/ipsecctl/sa15.in @@ -1,6 +1,6 @@ esp from 3ffe::1 to 3ffe::2 spi 0xdeadbeef \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp from 3ffe::2 to 3ffe::1 spi 0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa15.ok b/regress/sbin/ipsecctl/sa15.ok index 56cc4a8d9af..0f75aea6fb5 100644 --- a/regress/sbin/ipsecctl/sa15.ok +++ b/regress/sbin/ipsecctl/sa15.ok @@ -1,6 +1,6 @@ esp tunnel from 3ffe::1 to 3ffe::2 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from 3ffe::2 to 3ffe::1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa19.in b/regress/sbin/ipsecctl/sa19.in index 7b8c2a08bae..db60c175af5 100644 --- a/regress/sbin/ipsecctl/sa19.in +++ b/regress/sbin/ipsecctl/sa19.in @@ -1,3 +1,3 @@ esp from 3ffe::1 to any spi 0xdeadbeef:0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa19.ok b/regress/sbin/ipsecctl/sa19.ok index bb3ac7770cd..97a30aeb8e1 100644 --- a/regress/sbin/ipsecctl/sa19.ok +++ b/regress/sbin/ipsecctl/sa19.ok @@ -1,6 +1,6 @@ esp tunnel from 3ffe::1 to ::/0 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from ::/0 to 3ffe::1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa3.in b/regress/sbin/ipsecctl/sa3.in index 17ce0faa89d..ba706a0dbbb 100644 --- a/regress/sbin/ipsecctl/sa3.in +++ b/regress/sbin/ipsecctl/sa3.in @@ -1,6 +1,6 @@ esp from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa3.ok b/regress/sbin/ipsecctl/sa3.ok index 945780115ed..11b63147ae5 100644 --- a/regress/sbin/ipsecctl/sa3.ok +++ b/regress/sbin/ipsecctl/sa3.ok @@ -1,6 +1,6 @@ esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa7.in b/regress/sbin/ipsecctl/sa7.in index 7fcad9a812d..04decb0764e 100644 --- a/regress/sbin/ipsecctl/sa7.in +++ b/regress/sbin/ipsecctl/sa7.in @@ -1,3 +1,3 @@ esp from 1.1.1.1 to any spi 0xdeadbeef:0xbeefdead \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa7.ok b/regress/sbin/ipsecctl/sa7.ok index 69b3a217407..d3a3727ef13 100644 --- a/regress/sbin/ipsecctl/sa7.ok +++ b/regress/sbin/ipsecctl/sa7.ok @@ -1,6 +1,6 @@ esp tunnel from 1.1.1.1 to 0.0.0.0/0 spi 0xdeadbeef auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp tunnel from 0.0.0.0/0 to 1.1.1.1 spi 0xbeefdead auth hmac-sha2-256 enc aes \ authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee |