52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From b5787296b70e61c93502181d5ca0f23502eeaebb Mon Sep 17 00:00:00 2001
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
Date: Sun, 10 Mar 2013 19:39:14 +0100
|
|
Subject: [PATCH 207/482] * grub-core/commands/verify.c
|
|
(grub_verify_signature): Use unsigned operations to have intended shifts and
|
|
not divisions.
|
|
|
|
---
|
|
ChangeLog | 5 +++++
|
|
grub-core/commands/verify.c | 9 ++++++---
|
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 334f81d..c2821c9 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,5 +1,10 @@
|
|
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
|
|
intended shifts rather than division.
|
|
|
|
diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
|
|
index d399d0f..38bb941 100644
|
|
--- 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");
|
|
--
|
|
1.8.2.1
|
|
|