diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | configure.ac | 11 |
3 files changed, 8 insertions, 10 deletions
@@ -43,6 +43,9 @@ | |||
43 | - dtucker@cvs.openbsd.org 2013/11/07 04:26:56 | 43 | - dtucker@cvs.openbsd.org 2013/11/07 04:26:56 |
44 | [regress/kextype.sh] | 44 | [regress/kextype.sh] |
45 | trailing space | 45 | trailing space |
46 | - (dtucker) [Makefile.in configure.ac] Remove TEST_SSH_SHA256 environment | ||
47 | variable. It's no longer used now that we get the supported MACs from | ||
48 | ssh -Q. | ||
46 | 49 | ||
47 | 20131104 | 50 | 20131104 |
48 | - (djm) OpenBSD CVS Sync | 51 | - (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 @@ | |||
1 | # $Id: Makefile.in,v 1.342 2013/11/07 01:00:24 djm Exp $ | 1 | # $Id: Makefile.in,v 1.343 2013/11/07 11:33:48 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -409,7 +409,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | |||
409 | TEST_SSH_CONCH="conch"; \ | 409 | TEST_SSH_CONCH="conch"; \ |
410 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | 410 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ |
411 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ | 411 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ |
412 | TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \ | ||
413 | cd $(srcdir)/regress || exit $$?; \ | 412 | cd $(srcdir)/regress || exit $$?; \ |
414 | $(MAKE) \ | 413 | $(MAKE) \ |
415 | .OBJDIR="$${BUILDDIR}/regress" \ | 414 | .OBJDIR="$${BUILDDIR}/regress" \ |
@@ -432,7 +431,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | |||
432 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ | 431 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ |
433 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ | 432 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ |
434 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ | 433 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ |
435 | TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \ | ||
436 | EXEEXT="$(EXEEXT)" \ | 434 | EXEEXT="$(EXEEXT)" \ |
437 | $@ && echo all tests passed | 435 | $@ && echo all tests passed |
438 | 436 | ||
diff --git a/configure.ac b/configure.ac index e545730d7..31972cf9b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.538 2013/11/07 02:28:16 djm Exp $ | 1 | # $Id: configure.ac,v 1.539 2013/11/07 11:33:48 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.538 $) | 18 | AC_REVISION($Revision: 1.539 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2437,16 +2437,13 @@ fi | |||
2437 | AC_CHECK_FUNCS([crypt DES_crypt]) | 2437 | AC_CHECK_FUNCS([crypt DES_crypt]) |
2438 | 2438 | ||
2439 | # Search for SHA256 support in libc and/or OpenSSL | 2439 | # Search for SHA256 support in libc and/or OpenSSL |
2440 | AC_CHECK_FUNCS([SHA256_Update EVP_sha256], | 2440 | AC_CHECK_FUNCS([SHA256_Update EVP_sha256], , |
2441 | [TEST_SSH_SHA256=yes], | 2441 | [unsupported_algorithms="$unsupported_algorithms \ |
2442 | [TEST_SSH_SHA256=no | ||
2443 | unsupported_algorithms="$unsupported_algorithms \ | ||
2444 | hmac-sha2-256 hmac-sha2-512 \ | 2442 | hmac-sha2-256 hmac-sha2-512 \ |
2445 | diffie-hellman-group-exchange-sha256 \ | 2443 | diffie-hellman-group-exchange-sha256 \ |
2446 | hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" | 2444 | hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" |
2447 | ] | 2445 | ] |
2448 | ) | 2446 | ) |
2449 | AC_SUBST([TEST_SSH_SHA256]) | ||
2450 | 2447 | ||
2451 | # Check complete ECC support in OpenSSL | 2448 | # Check complete ECC support in OpenSSL |
2452 | AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) | 2449 | AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) |