* grub-core/commands/verify.c (grub_verify_signature): Use unsigned

	operations to have intended shifts and not divisions.

diff --git a/ChangeLog b/ChangeLog
index 334f81d71365c5545029eba9dd4a9db6bec9727f..c2821c9568c89956b7fc5fbb38d0c8fd3efa27f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/verify.c (grub_verify_signature): Use unsigned
+       operations to have intended shifts and not divisions.
+
 2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/pc/plan9.c (fill_disk): Fix types to use

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index d399d0fc8e9df7af8683affeedc9722233dc9d87..38bb9417d2e82bc5e935534902eca5937402cc46 100644 (file)
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -510,10 +510,13 @@ grub_verify_signature (grub_file_t f, grub_file_t sig,
       /* TRANSLATORS: %08x is 32-bit key id.  */
       return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("public key %08x not found"), keyid);
 
-    int nbits = gcry_mpi_get_nbits (sk->mpis[1]);
-    grub_dprintf ("crypt", "must be %d bits got %d bits\n", (int)nbits, (int)(8 * hash->mdlen));
+    unsigned nbits = gcry_mpi_get_nbits (sk->mpis[1]);
+    grub_dprintf ("crypt", "must be %u bits got %d bits\n", nbits,
+                 (int)(8 * hash->mdlen));
 
-    if (gcry_mpi_scan (&hmpi, GCRYMPI_FMT_USG, hval, nbits / 8 < (int) hash->mdlen ? nbits / 8 : (int) hash->mdlen, 0))
+    if (gcry_mpi_scan (&hmpi, GCRYMPI_FMT_USG, hval,
+                      nbits / 8 < (unsigned) hash->mdlen ? nbits / 8
+                      : (unsigned) hash->mdlen, 0))
       return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
     if (!grub_crypto_pk_dsa)
       return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("module `%s' isn't loaded"), "gcry_dsa");