diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
| commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
| tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /openbsd-compat/xcrypt.c | |
| parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
| parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) | |
merge 6.3p1
Diffstat (limited to 'openbsd-compat/xcrypt.c')
| -rw-r--r-- | openbsd-compat/xcrypt.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) |