diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2012-10-05 02:20:49 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2012-10-05 02:20:49 +0000 |
| commit | bbfeee53a177899a19fdb0f6b64e0f9785094d6d (patch) | |
| tree | 97f0821e04ee79df4c4a96dd40f69f649ecbfb85 | |
| parent | e5a819d848cf814b9036e11e1b76c561c2803455 (diff) | |
Add umac-128@openssh.com to the list of MACs to be tested
| -rw-r--r-- | regress/usr.bin/ssh/cipher-speed.sh | 6 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/try-ciphers.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/regress/usr.bin/ssh/cipher-speed.sh b/regress/usr.bin/ssh/cipher-speed.sh index 9cc2613d0d6..c332fd7d3e2 100644 --- a/regress/usr.bin/ssh/cipher-speed.sh +++ b/regress/usr.bin/ssh/cipher-speed.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $ +# $OpenBSD: cipher-speed.sh,v 1.6 2012/10/05 02:20:48 dtucker Exp $ # Placed in the Public Domain. tid="cipher speed" @@ -16,8 +16,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se aes128-ctr aes192-ctr aes256-ctr" -macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96 - hmac-sha2-256 hmac-sha2-512" +macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com + hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512" for c in $ciphers; do for m in $macs; do trace "proto 2 cipher $c mac $m" diff --git a/regress/usr.bin/ssh/try-ciphers.sh b/regress/usr.bin/ssh/try-ciphers.sh index feb35d3eb78..cbd7d7a1910 100644 --- a/regress/usr.bin/ssh/try-ciphers.sh +++ b/regress/usr.bin/ssh/try-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: try-ciphers.sh,v 1.14 2012/09/06 04:11:07 dtucker Exp $ +# $OpenBSD: try-ciphers.sh,v 1.15 2012/10/05 02:20:48 dtucker Exp $ # Placed in the Public Domain. tid="try ciphers" @@ -7,8 +7,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se aes128-ctr aes192-ctr aes256-ctr" -macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96 - hmac-sha2-256 hmac-sha2-512" +macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com + hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512" for c in $ciphers; do for m in $macs; do |