diff options
| author | djm <djm> | 2011-08-17 02:25:46 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-08-17 02:25:46 +0000 |
| commit | bfdbbef095b6e450ff3835bc1fc2cf33c4c5c718 (patch) | |
| tree | a0a858cf052b3a0e7d6dc6c3300dfae78b858b58 | |
| parent | 22345200794387450db8a539cc65dc4921843ec0 (diff) | |
| download | openssh-bfdbbef095b6e450ff3835bc1fc2cf33c4c5c718.tar.gz | |
- (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2
MAC tests for platforms that hack EVP_SHA2 support
| -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 @@ - djm@cvs.openbsd.org 2011/08/02 01:23:41 [regress/cipher-speed.sh regress/try-ciphers.sh] add SHA256/SHA512 based HMAC modes + - (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2 + MAC tests for platforms that hack EVP_SHA2 support 20110812 - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 0cdafc09..257afd17 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh @@ -16,8 +16,9 @@ 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-256-96 hmac-sha2-512 hmac-sha2-512-96" +macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" +config_defined HAVE_EVP_SHA256 && + macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" for c in $ciphers; do for m in $macs; do trace "proto 2 cipher $c mac $m" diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 5affb394..0918d224 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh @@ -7,8 +7,9 @@ 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-256-96 hmac-sha2-512 hmac-sha2-512-96" +macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" +config_defined HAVE_EVP_SHA256 && + macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" for c in $ciphers; do for m in $macs; do |