diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2012-06-30 15:08:53 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2012-06-30 15:08:53 +1000 |
| commit | a08c20763a0b4810cb3c837a434568cdff677cf7 (patch) | |
| tree | 97077a7b05677ac2474244dc69c57e57cdeec98a /regress/try-ciphers.sh | |
| parent | 2920bc145c9d8435e885ac6ad0a0ae613598d599 (diff) | |
- dtucker@cvs.openbsd.org 2012/06/28 05:07:45
[regress/try-ciphers.sh regress/cipher-speed.sh]
Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
from draft6 of the spec and will not be in the RFC when published. Patch
from mdb at juniper net via bz#2023, ok markus
Diffstat (limited to 'regress/try-ciphers.sh')
| -rw-r--r-- | regress/try-ciphers.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 0918d2245..925863504 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: try-ciphers.sh,v 1.12 2011/08/02 01:23:41 djm Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.13 2012/06/28 05:07:45 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="try ciphers" | 4 | tid="try ciphers" |
| @@ -9,7 +9,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 9 | aes128-ctr aes192-ctr aes256-ctr" | 9 | aes128-ctr aes192-ctr aes256-ctr" |
| 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" |
| 11 | config_defined HAVE_EVP_SHA256 && | 11 | config_defined HAVE_EVP_SHA256 && |
| 12 | macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | 12 | macs="$macs hmac-sha2-256 hmac-sha2-512" |
| 13 | 13 | ||
| 14 | for c in $ciphers; do | 14 | for c in $ciphers; do |
| 15 | for m in $macs; do | 15 | for m in $macs; do |