diff options
| author | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
| commit | eab78da6a54225de06271d9c8da650f04a55ed88 (patch) | |
| tree | aa258ca77515939f6d89317ff67fbcb0bca08b24 /regress/cipher-speed.sh | |
| parent | a26f5de49df59322fde07f7be91b3e3969c9c238 (diff) | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs.
- Allow "PermitOpen none" to refuse all port-forwarding requests
(closes: #543683).
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 257afd179..5800f4b09 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $ | 1 | # $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="cipher speed" | 4 | tid="cipher speed" |
| @@ -18,7 +18,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 18 | aes128-ctr aes192-ctr aes256-ctr" | 18 | aes128-ctr aes192-ctr aes256-ctr" |
| 19 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | 19 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" |
| 20 | config_defined HAVE_EVP_SHA256 && | 20 | config_defined HAVE_EVP_SHA256 && |
| 21 | macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | 21 | macs="$macs hmac-sha2-256 hmac-sha2-512" |
| 22 | 22 | ||
| 23 | for c in $ciphers; do for m in $macs; do | 23 | for c in $ciphers; do for m in $macs; do |
| 24 | trace "proto 2 cipher $c mac $m" | 24 | trace "proto 2 cipher $c mac $m" |