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/cipher-speed.sh | |
| parent | 2920bc145c9d8435e885ac6ad0a0ae613598d599 (diff) | |
| download | openssh-git-a08c20763a0b4810cb3c837a434568cdff677cf7.tar.gz | |
- 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/cipher-speed.sh')
| -rw-r--r-- | regress/cipher-speed.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 257afd17..5800f4b0 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $ +# $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $ # Placed in the Public Domain. tid="cipher speed" @@ -18,7 +18,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes128-ctr aes192-ctr aes256-ctr" macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" config_defined HAVE_EVP_SHA256 && - macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" + macs="$macs hmac-sha2-256 hmac-sha2-512" for c in $ciphers; do for m in $macs; do trace "proto 2 cipher $c mac $m" |