summaryrefslogtreecommitdiffstats
path: root/regress/try-ciphers.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-06-30 07:08:53 +0200
committerDarren Tucker <dtucker@zip.com.au>2012-06-30 07:08:53 +0200
commita08c20763a0b4810cb3c837a434568cdff677cf7 (patch)
tree97077a7b05677ac2474244dc69c57e57cdeec98a /regress/try-ciphers.sh
parent - dtucker@cvs.openbsd.org 2012/06/26 12:06:59 (diff)
downloadopenssh-a08c20763a0b4810cb3c837a434568cdff677cf7.tar.xz
openssh-a08c20763a0b4810cb3c837a434568cdff677cf7.zip
- 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.sh4
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 @@
-# $OpenBSD: try-ciphers.sh,v 1.12 2011/08/02 01:23:41 djm Exp $
+# $OpenBSD: try-ciphers.sh,v 1.13 2012/06/28 05:07:45 dtucker Exp $
# Placed in the Public Domain.
tid="try ciphers"
@@ -9,7 +9,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