Fix openssl passwd -1

This commit is contained in:
Bodo Möller
2001-01-19 07:38:55 +00:00
parent 2e72fde15f
commit ffac355834
2 changed files with 4 additions and 1 deletions

View File

@@ -4,6 +4,9 @@
Changes between 0.9.6 and 0.9.6a [xx XXX 2000] Changes between 0.9.6 and 0.9.6a [xx XXX 2000]
*) Fix 'openssl passwd -1'.
[Bodo Moeller]
*) Change PKCS12_key_gen_asc() so it can cope with non null *) Change PKCS12_key_gen_asc() so it can cope with non null
terminated strings whose length is passed in the passlen terminated strings whose length is passed in the passlen
parameter, for example from PEM callbacks. This was done parameter, for example from PEM callbacks. This was done

View File

@@ -315,7 +315,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
strncat(out_buf, "$", 1); strncat(out_buf, "$", 1);
strncat(out_buf, salt, 8); strncat(out_buf, salt, 8);
assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */ assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */
salt_out = out_buf + 6; salt_out = out_buf + 2 + strlen(magic);
salt_len = strlen(salt_out); salt_len = strlen(salt_out);
assert(salt_len <= 8); assert(salt_len <= 8);