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

* grub-core/commands/verify.c: Use GRUB_CHAR_BIT.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-05 10:52:13 +02:00
parent 98b23b9519
commit 52eab6562d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/verify.c: Use GRUB_CHAR_BIT.
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/bsdlabel.h: Use enums.

6
grub-core/commands/verify.c
View File

@ -77,7 +77,7 @@ read_packet_header (grub_file_t sig, grub_uint8_t *out_type, grub_size_t *len)
}
if (l < 224)
{
*len = (l - 192) << 8;
*len = (l - 192) << GRUB_CHAR_BIT;
if (grub_file_read (sig, &l, sizeof (l)) != 1)
return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
*len |= l;
@ -273,7 +273,7 @@ grub_load_public_key (grub_file_t f)
goto fail;
}
lb = (grub_be_to_cpu16 (l) + 7) / 8;
lb = (grub_be_to_cpu16 (l) + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT;
if (lb > sizeof (buffer) - sizeof (grub_uint16_t))
{
grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
@ -457,7 +457,7 @@ grub_verify_signature_real (char *buf, grub_size_t size,
{
if (ptr + 1 >= readbuf + rem)
break;
l = (((ptr[0] & ~192) << 8) | ptr[1]) + 192;
l = (((ptr[0] & ~192) << GRUB_CHAR_BIT) | ptr[1]) + 192;
ptr += 2;
}
else