3 files changed, 16 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ef4dc7050..58efd7b1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
- 20130529
+20130601
+ - (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.
+
+20130529
   - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null
     implementation of endgrent for platforms that don't have it (eg Android).
     Loosely based on a patch from Nathan Osman, ok djm
+
  20130517
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2013/03/07 00:20:34
diff --git a/configure.ac b/configure.ac
index 13c055849..c70c504f9 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],
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index 6291e2884..c8aea461d 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -55,7 +55,12 @@
 
 # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
 #  include "md5crypt.h"
-# endif 
+# endif
+
+# if !defined(HAVE_CRYPT) && defined(HAVE_DES_CRYPT)
+#  include <openssl/des.h>
+#  define crypt DES_crypt
+# endif
 
 char *
 xcrypt(const char *password, const char *salt)