RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-15 14:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [Makefile.in configure.ac] Remove TEST_SSH_SHA256 environment

Browse Source 
variable.  It's no longer used now that we get the supported MACs from
   ssh -Q.
This commit is contained in:
Darren Tucker 2013-11-07 22:33:48 +11:00
parent 6e9d6f4112
commit 4bf7e50e53
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

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

4
Makefile.in
View File

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

11
configure.ac
View File

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