diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 06:28:03 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 06:28:03 +1000 |
commit | c0c3373216801797053e123b5f62d35bf41b3611 (patch) | |
tree | 7a621c053d11d782a6f6229571e650728c4addd7 /configure.ac | |
parent | efdf5342143a887013a1daae583167dadf6752a7 (diff) |
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
using openssl's DES_crpyt function on platorms that don't have a native
one, eg Android. Based on a patch from Nathan Osman.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 13c055849..c70c504f9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.525 2013/05/29 22:29:09 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.526 2013/06/01 20:28:04 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.525 $) | 18 | AC_REVISION($Revision: 1.526 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2388,6 +2388,7 @@ fi | |||
2388 | if test "x$check_for_libcrypt_later" = "x1"; then | 2388 | if test "x$check_for_libcrypt_later" = "x1"; then |
2389 | AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) | 2389 | AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) |
2390 | fi | 2390 | fi |
2391 | AC_CHECK_FUNCS([crypt DES_crypt]) | ||
2391 | 2392 | ||
2392 | # Search for SHA256 support in libc and/or OpenSSL | 2393 | # Search for SHA256 support in libc and/or OpenSSL |
2393 | AC_CHECK_FUNCS([SHA256_Update EVP_sha256], [TEST_SSH_SHA256=yes], | 2394 | AC_CHECK_FUNCS([SHA256_Update EVP_sha256], [TEST_SSH_SHA256=yes], |