2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bac8998c0..09d5c1304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
      [integrity.sh]
      oops, forgot to increase the output of the ssh command to ensure that
      we actually reach $offset
+ - (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that
+   lack support for SHA2.
 
 20130217
  - OpenBSD CVS Sync
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 0a0146e05..2a93372fc 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -9,11 +9,13 @@ tid="integrity"
 tries=10
 startoffset=2900
 macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
-        hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512
+        hmac-sha1-96 hmac-md5-96 
         hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
         umac-64-etm@openssh.com umac-128-etm@openssh.com
-        hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com
-        hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
+        hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com"
+config_defined HAVE_EVP_SHA256 &&
+        macs="$macs hmac-sha2-256 hmac-sha2-512
+                hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
 # The following are not MACs, but ciphers with integrated integrity. They are
 # handled specially below.
 config_defined OPENSSL_HAVE_EVPGCM && \