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) | |
| download | openssh-git-c0c3373216801797053e123b5f62d35bf41b3611.tar.gz | |
- (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 13c05584..c70c504f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.525 2013/05/29 22:29:09 dtucker Exp $ +# $Id: configure.ac,v 1.526 2013/06/01 20:28:04 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.525 $) +AC_REVISION($Revision: 1.526 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2388,6 +2388,7 @@ fi if test "x$check_for_libcrypt_later" = "x1"; then AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) 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], |