Attachment 2288 Details for Bug 2112 – Use OpenSSL DES_crypt function as a drop-in replacement for crypt().

[patch] Use OpenSSL DES_crypt function as a drop-in replacement for crypt().

openssh-android-crypt.patch (text/plain), 1005 bytes, created by Darren Tucker on 2013-06-02 06:07:14 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2013-06-02 06:07:14 AEST

Size: 1005 bytes

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.525
>diff -u -p -r1.525 configure.ac
>--- configure.ac	29 May 2013 22:29:09 -0000	1.525
>+++ configure.ac	1 Jun 2013 19:55:29 -0000
>@@ -1530,6 +1530,7 @@ AC_CHECK_FUNCS([ \
> 	bindresvport_sa \
> 	clock \
> 	closefrom \
>+	crypt \
> 	dirfd \
> 	endgrent \
> 	fchmod \
>Index: openbsd-compat/xcrypt.c
>===================================================================
>RCS file: /var/cvs/openssh/openbsd-compat/xcrypt.c,v
>retrieving revision 1.12
>diff -u -p -r1.12 xcrypt.c
>--- openbsd-compat/xcrypt.c	7 Jan 2009 18:04:12 -0000	1.12
>+++ openbsd-compat/xcrypt.c	1 Jun 2013 19:55:29 -0000
>@@ -55,7 +55,12 @@
> 
> # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
> #  include "md5crypt.h"
>-# endif 
>+# endif
>+
>+# if !defined(HAVE_CRYPT)
>+#  include <openssl/des.h>
>+#  define crypt DES_crypt
>+# endif
> 
> char *
> xcrypt(const char *password, const char *salt)

Actions: View | Diff

Attachments on bug 2112: 2284 | 2288