RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

on configurations that don't have it.
This commit is contained in:
Darren Tucker 2011-01-16 18:28:09 +11:00
parent 08f83883f5
commit 50c61f88ab
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

4
Makefile.in
View File

@ -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

8
configure.ac
View File

@ -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])

4
regress/kextype.sh
View File

@ -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"