diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2011-01-16 18:28:09 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2011-01-16 18:28:09 +1100 |
| commit | 50c61f88abdb356d45026dc1427ddb461b626e45 (patch) | |
| tree | 87eab3a214fc0da27482b46dcce30bc7fe634774 | |
| parent | 08f83883f518fa0e9765ed25ae6c19e279633ea9 (diff) | |
- (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
on configurations that don't have it.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | regress/kextype.sh | 4 |
4 files changed, 15 insertions, 5 deletions
@@ -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 3ace262e..c4011daf 100644 --- 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 3d4d11c9..1817dd90 100644 --- 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 9f8b7bcd..79c0817b 100644 --- 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" |