diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-20 16:14:23 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-08-20 16:53:18 -0700 |
| commit | d9da10d147d633fdb6ec65e17ff4b8447419d83e (patch) | |
| tree | 8f93e8fdc2907f141e0924910bfec26669819f0b /md5crypt.c | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | ecb2c02d994b3e21994f31a70ff911667c262f1f (diff) | |
Merge upstream-master into master
Commit ecb2c02d994b3e21994f31a70ff911667c262f1f upstream
This nearly (but not quite) corresponds to V_8_3_P1; subsequent
cherry-picks will correct this.
Bug: 162492243
Change-Id: I3c079d86435b7c25aefff4538dc89a3002b1e25b
Diffstat (limited to 'md5crypt.c')
| -rw-r--r-- | md5crypt.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -50,7 +50,7 @@ is_md5_salt(const char *salt) char * md5_crypt(const char *pw, const char *salt) { - static char passwd[120], salt_copy[9], *p; + static char passwd[120], salt_copy[9]; static const char *sp, *ep; unsigned char final[16]; int sl, pl, i, j; @@ -139,8 +139,6 @@ md5_crypt(const char *pw, const char *salt) MD5_Final(final, &ctx1); } - p = passwd + strlen(passwd); - l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; strlcat(passwd, to64(l, 4), sizeof(passwd)); l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; |