- (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based

   on configurations that don't have it.

diff --git a/ChangeLog b/ChangeLog
index ccc8bc302693c0374c5d2b69d853c4276eb60ea3..1266e99844e1c9bc63811cd212b53b43ed0ba1a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20110116
+ - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
+   on configurations that don't have it.
+
 20110114
  - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2011/01/13 21:54:53

diff --git a/Makefile.in b/Makefile.in
index 3ace262e8766d1b67f8e8c4858d2fa99bfe15e21..c4011daf77da4c029b2822a6e84cf8c1879ec4fb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.318 2011/01/14 03:47:40 djm Exp $
+# $Id: Makefile.in,v 1.319 2011/01/16 07:28:10 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -416,6 +416,7 @@ tests interop-tests:        $(TARGETS)
        TEST_SSH_CONCH="conch"; \
        TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
        TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
+       TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \
        cd $(srcdir)/regress || exit $$?; \
        $(MAKE) \
                .OBJDIR="$${BUILDDIR}/regress" \
@@ -438,6 +439,7 @@ tests interop-tests:        $(TARGETS)
                TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
                TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
                TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+               TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \
                EXEEXT="$(EXEEXT)" \
                $@ && echo all tests passed
 

diff --git a/configure.ac b/configure.ac
index 3d4d11c92045a6d05e6d46340e70380200838cf8..1817dd909897e9619c1d9f480d07acece0b008bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.464 2011/01/13 06:35:46 tim Exp $
+# $Id: configure.ac,v 1.465 2011/01/16 07:28:12 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.464 $)
+AC_REVISION($Revision: 1.465 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 # local macros
@@ -2239,7 +2239,9 @@ if test "x$check_for_libcrypt_later" = "x1"; then
 fi
 
 # Search for SHA256 support in libc and/or OpenSSL
-AC_CHECK_FUNCS(SHA256_Update EVP_sha256)
+AC_CHECK_FUNCS(SHA256_Update EVP_sha256, [TEST_SSH_SHA256=yes],
+    [TEST_SSH_SHA256=no])
+AC_SUBST(TEST_SSH_SHA256)
 
 # Check complete ECC support in OpenSSL
 AC_MSG_CHECKING([whether OpenSSL has complete ECC support])

diff --git a/regress/kextype.sh b/regress/kextype.sh
index 9f8b7bcd0bdd0fc5770459a9bf7daf69e8390c92..79c0817bb05c2ad4bf25c7a1ed2e37e5eca067d1 100644 (file)
--- a/regress/kextype.sh
+++ b/regress/kextype.sh
@@ -10,7 +10,9 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 if test "$TEST_SSH_ECC" = "yes"; then
        kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
 fi
-kextypes="$kextypes diffie-hellman-group-exchange-sha256"
+if test "$TEST_SSH_SHA256" = "yes"; then
+       kextypes="$kextypes diffie-hellman-group-exchange-sha256"
+fi
 kextypes="$kextypes diffie-hellman-group-exchange-sha1"
 kextypes="$kextypes diffie-hellman-group14-sha1"
 kextypes="$kextypes diffie-hellman-group1-sha1"