diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | regress/cipher-speed.sh | 5 | ||||
| -rw-r--r-- | regress/try-ciphers.sh | 5 |
3 files changed, 8 insertions, 4 deletions
| @@ -17,6 +17,8 @@ | |||
| 17 | - djm@cvs.openbsd.org 2011/08/02 01:23:41 | 17 | - djm@cvs.openbsd.org 2011/08/02 01:23:41 |
| 18 | [regress/cipher-speed.sh regress/try-ciphers.sh] | 18 | [regress/cipher-speed.sh regress/try-ciphers.sh] |
| 19 | add SHA256/SHA512 based HMAC modes | 19 | add SHA256/SHA512 based HMAC modes |
| 20 | - (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2 | ||
| 21 | MAC tests for platforms that hack EVP_SHA2 support | ||
| 20 | 22 | ||
| 21 | 20110812 | 23 | 20110812 |
| 22 | - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context | 24 | - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context |
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 0cdafc092..257afd179 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
| @@ -16,8 +16,9 @@ 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 hmac-sha1-96 hmac-md5-96" |
| 20 | hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | 20 | config_defined HAVE_EVP_SHA256 && |
| 21 | macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | ||
| 21 | 22 | ||
| 22 | for c in $ciphers; do for m in $macs; do | 23 | for c in $ciphers; do for m in $macs; do |
| 23 | trace "proto 2 cipher $c mac $m" | 24 | trace "proto 2 cipher $c mac $m" |
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 5affb3943..0918d2245 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
| @@ -7,8 +7,9 @@ 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 hmac-sha1-96 hmac-md5-96" |
| 11 | hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | 11 | config_defined HAVE_EVP_SHA256 && |
| 12 | macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | ||
| 12 | 13 | ||
| 13 | for c in $ciphers; do | 14 | for c in $ciphers; do |
| 14 | for m in $macs; do | 15 | for m in $macs; do |