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

diff --git a/ChangeLog b/ChangeLog
index 37021c0f86e78a5308d07c6cdd0dc8b9e922b8e7..e52e7ee7e38ae561488ced2bf0bfdd0a560f9308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index bd47611498886476ad6a252d02cd816b7062ac28..fd6f43600746d706d1c536918a1ffc751ba3f7e8 100644 (file)
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -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