diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /regress/cipher-speed.sh | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'regress/cipher-speed.sh')
-rw-r--r-- | regress/cipher-speed.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 85de6d585..257afd179 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cipher-speed.sh,v 1.3 2007/06/07 19:41:46 pvalchev Exp $ | 1 | # $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="cipher speed" | 4 | tid="cipher speed" |
@@ -12,9 +12,13 @@ tries="1 2" | |||
12 | DATA=/bin/ls | 12 | DATA=/bin/ls |
13 | DATA=/bsd | 13 | DATA=/bsd |
14 | 14 | ||
15 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | ||
16 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | 15 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc |
17 | arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc aes128-ctr" | 16 | arcfour128 arcfour256 arcfour |
17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se | ||
18 | aes128-ctr aes192-ctr aes256-ctr" | ||
19 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | ||
20 | config_defined HAVE_EVP_SHA256 && | ||
21 | macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | ||
18 | 22 | ||
19 | for c in $ciphers; do for m in $macs; do | 23 | for c in $ciphers; do for m in $macs; do |
20 | trace "proto 2 cipher $c mac $m" | 24 | trace "proto 2 cipher $c mac $m" |