Commit ffac3558 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix openssl passwd -1

parent 2e72fde1

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 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

     terminated strings whose length is passed in the passlen

     parameter, for example from PEM callbacks. This was done

apps/passwd.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt) 
	strncat(out_buf, "$", 1);

	strncat(out_buf, salt, 8);

	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);

	assert(salt_len <= 8);