vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

md5crypt: Use all bits of currticks () to generate the salt.

Browse source
This commit is contained in:
jochen 2000-10-25 14:28:20 +00:00
parent b16aca65b6
commit 8dd10ab852
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-10-25 Jochen Hoenicke <jochen@gnu.org>
* stage2/builtins.c (md5crypt_func): Use all bits of currticks ()
to generate the salt. The old code would often produce the same
one character salt.
2000-10-25 OKUJI Yoshinori <okuji@gnu.org> 2000-10-25 OKUJI Yoshinori <okuji@gnu.org>
* stage2/apm.S (get_apm_info): Fix a serious typo: prot_to_real * stage2/apm.S (get_apm_info): Fix a serious typo: prot_to_real

12
stage2/builtins.c
View file

@ -2378,7 +2378,7 @@ md5crypt_func (char *arg, int flags)
{ {
char crypted[36]; char crypted[36];
char key[32]; char key[32];
int saltlen; int seed;
int i; int i;
const char *const seedchars = const char *const seedchars =
"./0123456789ABCDEFGHIJKLMNOPQRST" "./0123456789ABCDEFGHIJKLMNOPQRST"
@ -2391,19 +2391,17 @@ md5crypt_func (char *arg, int flags)
grub_memmove (crypted, "$1$", 3); grub_memmove (crypted, "$1$", 3);
/* Create the length of a salt. */ /* Create the length of a salt. */
saltlen = currticks (); seed = currticks ();
saltlen &= 7;
saltlen++;
/* Generate a salt. */ /* Generate a salt. */
for (i = 0; i < saltlen; i++) for (i = 0; i < 8 && seed; i++)
{ {
/* FIXME: This should be more random. */ /* FIXME: This should be more random. */
crypted[3 + i] = seedchars[(currticks () >> i) & 0x3f]; crypted[3 + i] = seedchars[seed & 0x3f];
seed >>= 6;
} }
/* A salt must be terminated with `$', if it is less than 8 chars. */ /* A salt must be terminated with `$', if it is less than 8 chars. */
if (saltlen != 8)
crypted[3 + i] = '$'; crypted[3 + i] = '$';
#ifdef DEBUG_MD5CRYPT #ifdef DEBUG_MD5CRYPT