- (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2

   MAC tests for platforms that hack EVP_SHA2 support

diff --git a/ChangeLog b/ChangeLog
index 441f1c31250d540d83cdbd71973b0d5f740204d7..c36d2c5eb785c9ff308d5968042543f7789b59e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0cdafc0920eb4045f68ccd5a3f11700ae28056a0..257afd17931f0d6e2cb8d0c71968f4419de84367 100644 (file)
--- 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 5affb39431832aa69f785cb4c1eaa70d45ed7639..0918d224567d9b5d01f413a0f0be667967098311 100644 (file)
--- 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