diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/cipher-speed.sh | 5 | ||||
| -rw-r--r-- | regress/try-ciphers.sh | 5 |
3 files changed, 9 insertions, 4 deletions
| @@ -18,6 +18,9 @@ | |||
| 18 | make AllowTcpForwarding accept "local" and "remote" in addition to its | 18 | make AllowTcpForwarding accept "local" and "remote" in addition to its |
| 19 | current "yes"/"no" to allow the server to specify whether just local or | 19 | current "yes"/"no" to allow the server to specify whether just local or |
| 20 | remote TCP forwarding is enabled. ok markus@ | 20 | remote TCP forwarding is enabled. ok markus@ |
| 21 | - dtucker@cvs.openbsd.org 2012/10/05 02:20:48 | ||
| 22 | [regress/cipher-speed.sh regress/try-ciphers.sh] | ||
| 23 | Add umac-128@openssh.com to the list of MACs to be tested | ||
| 21 | 24 | ||
| 22 | 20121114 | 25 | 20121114 |
| 23 | - (djm) OpenBSD CVS Sync | 26 | - (djm) OpenBSD CVS Sync |
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 5800f4b09..4f26f7e96 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $ | 1 | # $OpenBSD: cipher-speed.sh,v 1.6 2012/10/05 02:20:48 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="cipher speed" | 4 | tid="cipher speed" |
| @@ -16,7 +16,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 16 | arcfour128 arcfour256 arcfour | 16 | arcfour128 arcfour256 arcfour |
| 17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se | 17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se |
| 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 umac-128@openssh.com |
| 20 | hmac-sha1-96 hmac-md5-96" | ||
| 20 | config_defined HAVE_EVP_SHA256 && | 21 | config_defined HAVE_EVP_SHA256 && |
| 21 | macs="$macs hmac-sha2-256 hmac-sha2-512" | 22 | macs="$macs hmac-sha2-256 hmac-sha2-512" |
| 22 | 23 | ||
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 0887979d8..cf6014297 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: try-ciphers.sh,v 1.14 2012/09/06 04:11:07 dtucker Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.15 2012/10/05 02:20:48 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="try ciphers" | 4 | tid="try ciphers" |
| @@ -7,7 +7,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 7 | arcfour128 arcfour256 arcfour | 7 | arcfour128 arcfour256 arcfour |
| 8 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se | 8 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se |
| 9 | aes128-ctr aes192-ctr aes256-ctr" | 9 | aes128-ctr aes192-ctr aes256-ctr" |
| 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com |
| 11 | hmac-sha1-96 hmac-md5-96" | ||
| 11 | config_defined HAVE_EVP_SHA256 && | 12 | config_defined HAVE_EVP_SHA256 && |
| 12 | macs="$macs hmac-sha2-256 hmac-sha2-512" | 13 | macs="$macs hmac-sha2-256 hmac-sha2-512" |
| 13 | 14 | ||