diff options
author | Colin Watson <cjwatson@debian.org> | 2016-12-20 00:22:52 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-12-20 00:22:52 +0000 |
commit | 971a7653746a6972b907dfe0ce139c06e4a6f482 (patch) | |
tree | 70fb964265d57ae4967be55b75dbb2a122e9b969 /openbsd-compat/xcrypt.c | |
parent | a8ed8d256b2e2c05b0c15565a7938028c5192277 (diff) | |
parent | 4a354fc231174901f2629437c2a6e924a2dd6772 (diff) |
Import openssh_7.4p1.orig.tar.gz
Diffstat (limited to 'openbsd-compat/xcrypt.c')
-rw-r--r-- | openbsd-compat/xcrypt.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index cf6a9b99f..c9c6283cc 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
@@ -42,7 +42,7 @@ | |||
42 | # include <sys/security.h> | 42 | # include <sys/security.h> |
43 | # include <sys/audit.h> | 43 | # include <sys/audit.h> |
44 | # include <prot.h> | 44 | # include <prot.h> |
45 | # endif | 45 | # endif |
46 | 46 | ||
47 | # if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) | 47 | # if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) |
48 | # include <shadow.h> | 48 | # include <shadow.h> |
@@ -108,20 +108,20 @@ xcrypt(const char *password, const char *salt) | |||
108 | salt = pick_salt(); | 108 | salt = pick_salt(); |
109 | 109 | ||
110 | # ifdef HAVE_MD5_PASSWORDS | 110 | # ifdef HAVE_MD5_PASSWORDS |
111 | if (is_md5_salt(salt)) | 111 | if (is_md5_salt(salt)) |
112 | crypted = md5_crypt(password, salt); | 112 | crypted = md5_crypt(password, salt); |
113 | else | 113 | else |
114 | crypted = crypt(password, salt); | 114 | crypted = crypt(password, salt); |
115 | # elif defined(__hpux) && !defined(HAVE_SECUREWARE) | 115 | # elif defined(__hpux) && !defined(HAVE_SECUREWARE) |
116 | if (iscomsec()) | 116 | if (iscomsec()) |
117 | crypted = bigcrypt(password, salt); | 117 | crypted = bigcrypt(password, salt); |
118 | else | 118 | else |
119 | crypted = crypt(password, salt); | 119 | crypted = crypt(password, salt); |
120 | # elif defined(HAVE_SECUREWARE) | 120 | # elif defined(HAVE_SECUREWARE) |
121 | crypted = bigcrypt(password, salt); | 121 | crypted = bigcrypt(password, salt); |
122 | # else | 122 | # else |
123 | crypted = crypt(password, salt); | 123 | crypted = crypt(password, salt); |
124 | # endif | 124 | # endif |
125 | 125 | ||
126 | return crypted; | 126 | return crypted; |
127 | } | 127 | } |