diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | openbsd-compat/xcrypt.c | 7 |
3 files changed, 16 insertions, 4 deletions
@@ -1,7 +1,13 @@ | |||
1 | 20130529 | 1 | 20130601 |
2 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to | ||
3 | using openssl's DES_crpyt function on platorms that don't have a native | ||
4 | one, eg Android. Based on a patch from Nathan Osman. | ||
5 | |||
6 | 20130529 | ||
2 | - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null | 7 | - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null |
3 | implementation of endgrent for platforms that don't have it (eg Android). | 8 | implementation of endgrent for platforms that don't have it (eg Android). |
4 | Loosely based on a patch from Nathan Osman, ok djm | 9 | Loosely based on a patch from Nathan Osman, ok djm |
10 | |||
5 | 20130517 | 11 | 20130517 |
6 | - (dtucker) OpenBSD CVS Sync | 12 | - (dtucker) OpenBSD CVS Sync |
7 | - djm@cvs.openbsd.org 2013/03/07 00:20:34 | 13 | - 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 @@ | |||
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], |
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 @@ | |||
55 | 55 | ||
56 | # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) | 56 | # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) |
57 | # include "md5crypt.h" | 57 | # include "md5crypt.h" |
58 | # endif | 58 | # endif |
59 | |||
60 | # if !defined(HAVE_CRYPT) && defined(HAVE_DES_CRYPT) | ||
61 | # include <openssl/des.h> | ||
62 | # define crypt DES_crypt | ||
63 | # endif | ||
59 | 64 | ||
60 | char * | 65 | char * |
61 | xcrypt(const char *password, const char *salt) | 66 | xcrypt(const char *password, const char *salt) |