diff options
-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 @@ | |||
1 | 20110116 | ||
2 | - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based | ||
3 | on configurations that don't have it. | ||
4 | |||
1 | 20110114 | 5 | 20110114 |
2 | - OpenBSD CVS Sync | 6 | - OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2011/01/13 21:54:53 | 7 | - djm@cvs.openbsd.org 2011/01/13 21:54:53 |
diff --git a/Makefile.in b/Makefile.in index 3ace262e8..c4011daf7 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.318 2011/01/14 03:47:40 djm Exp $ | 1 | # $Id: Makefile.in,v 1.319 2011/01/16 07:28:10 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@ |
@@ -416,6 +416,7 @@ tests interop-tests: $(TARGETS) | |||
416 | TEST_SSH_CONCH="conch"; \ | 416 | TEST_SSH_CONCH="conch"; \ |
417 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | 417 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ |
418 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ | 418 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ |
419 | TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \ | ||
419 | cd $(srcdir)/regress || exit $$?; \ | 420 | cd $(srcdir)/regress || exit $$?; \ |
420 | $(MAKE) \ | 421 | $(MAKE) \ |
421 | .OBJDIR="$${BUILDDIR}/regress" \ | 422 | .OBJDIR="$${BUILDDIR}/regress" \ |
@@ -438,6 +439,7 @@ tests interop-tests: $(TARGETS) | |||
438 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ | 439 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ |
439 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ | 440 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ |
440 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ | 441 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ |
442 | TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \ | ||
441 | EXEEXT="$(EXEEXT)" \ | 443 | EXEEXT="$(EXEEXT)" \ |
442 | $@ && echo all tests passed | 444 | $@ && echo all tests passed |
443 | 445 | ||
diff --git a/configure.ac b/configure.ac index 3d4d11c92..1817dd909 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.464 2011/01/13 06:35:46 tim Exp $ | 1 | # $Id: configure.ac,v 1.465 2011/01/16 07:28:12 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.464 $) | 18 | AC_REVISION($Revision: 1.465 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | # local macros | 21 | # local macros |
@@ -2239,7 +2239,9 @@ if test "x$check_for_libcrypt_later" = "x1"; then | |||
2239 | fi | 2239 | fi |
2240 | 2240 | ||
2241 | # Search for SHA256 support in libc and/or OpenSSL | 2241 | # Search for SHA256 support in libc and/or OpenSSL |
2242 | AC_CHECK_FUNCS(SHA256_Update EVP_sha256) | 2242 | AC_CHECK_FUNCS(SHA256_Update EVP_sha256, [TEST_SSH_SHA256=yes], |
2243 | [TEST_SSH_SHA256=no]) | ||
2244 | AC_SUBST(TEST_SSH_SHA256) | ||
2243 | 2245 | ||
2244 | # Check complete ECC support in OpenSSL | 2246 | # Check complete ECC support in OpenSSL |
2245 | AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) | 2247 | AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) |
diff --git a/regress/kextype.sh b/regress/kextype.sh index 9f8b7bcd0..79c0817bb 100644 --- a/regress/kextype.sh +++ b/regress/kextype.sh | |||
@@ -10,7 +10,9 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak | |||
10 | if test "$TEST_SSH_ECC" = "yes"; then | 10 | if test "$TEST_SSH_ECC" = "yes"; then |
11 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" | 11 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" |
12 | fi | 12 | fi |
13 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | 13 | if test "$TEST_SSH_SHA256" = "yes"; then |
14 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | ||
15 | fi | ||
14 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" | 16 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" |
15 | kextypes="$kextypes diffie-hellman-group14-sha1" | 17 | kextypes="$kextypes diffie-hellman-group14-sha1" |
16 | kextypes="$kextypes diffie-hellman-group1-sha1" | 18 | kextypes="$kextypes diffie-hellman-group1-sha1" |