diff options
author | Colin Watson <cjwatson@debian.org> | 2018-04-03 08:20:28 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-04-03 08:20:28 +0100 |
commit | ed6ae9c1a014a08ff5db3d768f01f2e427eeb476 (patch) | |
tree | 601025e307745d351946c01ab13f419ddb6dae29 /md5crypt.c | |
parent | 62f54f20bf351468e0124f63cc2902ee40d9b0e9 (diff) | |
parent | a0349a1cc4a18967ad1dbff5389bcdf9da098814 (diff) |
Import openssh_7.7p1.orig.tar.gz
Diffstat (limited to 'md5crypt.c')
-rw-r--r-- | md5crypt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/md5crypt.c b/md5crypt.c index 22ef98933..52cf2959a 100644 --- a/md5crypt.c +++ b/md5crypt.c | |||
@@ -50,7 +50,7 @@ is_md5_salt(const char *salt) | |||
50 | char * | 50 | char * |
51 | md5_crypt(const char *pw, const char *salt) | 51 | md5_crypt(const char *pw, const char *salt) |
52 | { | 52 | { |
53 | static char passwd[120], salt_copy[9], *p; | 53 | static char passwd[120], salt_copy[9]; |
54 | static const char *sp, *ep; | 54 | static const char *sp, *ep; |
55 | unsigned char final[16]; | 55 | unsigned char final[16]; |
56 | int sl, pl, i, j; | 56 | int sl, pl, i, j; |
@@ -139,8 +139,6 @@ md5_crypt(const char *pw, const char *salt) | |||
139 | MD5_Final(final, &ctx1); | 139 | MD5_Final(final, &ctx1); |
140 | } | 140 | } |
141 | 141 | ||
142 | p = passwd + strlen(passwd); | ||
143 | |||
144 | l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; | 142 | l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; |
145 | strlcat(passwd, to64(l, 4), sizeof(passwd)); | 143 | strlcat(passwd, to64(l, 4), sizeof(passwd)); |
146 | l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; | 144 | l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; |