From 4bf7e50e533aa956366df7402c132f202e841a48 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 7 Nov 2013 22:33:48 +1100 Subject: - (dtucker) [Makefile.in configure.ac] Remove TEST_SSH_SHA256 environment variable. It's no longer used now that we get the supported MACs from ssh -Q. --- ChangeLog | 3 +++ Makefile.in | 4 +--- configure.ac | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a98668ea..339577202 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,9 @@ - dtucker@cvs.openbsd.org 2013/11/07 04:26:56 [regress/kextype.sh] trailing space + - (dtucker) [Makefile.in configure.ac] Remove TEST_SSH_SHA256 environment + variable. It's no longer used now that we get the supported MACs from + ssh -Q. 20131104 - (djm) OpenBSD CVS Sync diff --git a/Makefile.in b/Makefile.in index 58ea78a72..242a9bd53 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.342 2013/11/07 01:00:24 djm Exp $ +# $Id: Makefile.in,v 1.343 2013/11/07 11:33:48 dtucker Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -409,7 +409,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) 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" \ @@ -432,7 +431,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) 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 e545730d7..31972cf9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.538 2013/11/07 02:28:16 djm Exp $ +# $Id: configure.ac,v 1.539 2013/11/07 11:33:48 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.538 $) +AC_REVISION($Revision: 1.539 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2437,16 +2437,13 @@ fi AC_CHECK_FUNCS([crypt DES_crypt]) # Search for SHA256 support in libc and/or OpenSSL -AC_CHECK_FUNCS([SHA256_Update EVP_sha256], - [TEST_SSH_SHA256=yes], - [TEST_SSH_SHA256=no - unsupported_algorithms="$unsupported_algorithms \ +AC_CHECK_FUNCS([SHA256_Update EVP_sha256], , + [unsupported_algorithms="$unsupported_algorithms \ hmac-sha2-256 hmac-sha2-512 \ diffie-hellman-group-exchange-sha256 \ hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" ] ) -AC_SUBST([TEST_SSH_SHA256]) # Check complete ECC support in OpenSSL AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) -- cgit v1.2.3