tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/grub-mkpasswd-pbkdf2: Simplify the main function implementation

Browse Source 
Allocate memory if needed, while saving the corresponding release
operation, reducing the amount of code and code complexity.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Tianjia Zhang 2024-05-27 20:42:04 +08:00 committed by Daniel Kiper
parent fa36f63760
commit 0b4d01794a
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/grub-mkpasswd-pbkdf2.c
View File

@ -133,34 +133,24 @@ main (int argc, char *argv[])
exit(1); exit(1);
} }
buf = xmalloc (arguments.buflen);
salt = xmalloc (arguments.saltlen);
printf ("%s", _("Enter password: ")); printf ("%s", _("Enter password: "));
if (!grub_password_get (pass1, GRUB_AUTH_MAX_PASSLEN)) if (!grub_password_get (pass1, GRUB_AUTH_MAX_PASSLEN))
{ grub_util_error ("%s", _("failure to read password"));
free (buf);
free (salt);
grub_util_error ("%s", _("failure to read password"));
}
printf ("%s", _("Reenter password: ")); printf ("%s", _("Reenter password: "));
if (!grub_password_get (pass2, GRUB_AUTH_MAX_PASSLEN)) if (!grub_password_get (pass2, GRUB_AUTH_MAX_PASSLEN))
{ grub_util_error ("%s", _("failure to read password"));
free (buf);
free (salt);
grub_util_error ("%s", _("failure to read password"));
}
if (strcmp (pass1, pass2) != 0) if (strcmp (pass1, pass2) != 0)
{ {
memset (pass1, 0, sizeof (pass1)); memset (pass1, 0, sizeof (pass1));
memset (pass2, 0, sizeof (pass2)); memset (pass2, 0, sizeof (pass2));
free (buf);
free (salt);
grub_util_error ("%s", _("passwords don't match")); grub_util_error ("%s", _("passwords don't match"));
} }
memset (pass2, 0, sizeof (pass2)); memset (pass2, 0, sizeof (pass2));
buf = xmalloc (arguments.buflen);
salt = xmalloc (arguments.saltlen);
if (grub_get_random (salt, arguments.saltlen)) if (grub_get_random (salt, arguments.saltlen))
{ {
memset (pass1, 0, sizeof (pass1)); memset (pass1, 0, sizeof (pass1));