|
 |
a5bd9f6 |
From 28faaaf7c2a7b639839dcb027275f0f8631ed837 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Fri, 5 Apr 2013 10:59:26 +0200
|
|
|
a5bd9f6 |
Subject: [PATCH 262/364] Replace 8 with GRUB_CHAR_BIT in several places
|
|
|
a5bd9f6 |
when appropriate.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 4 ++++
|
|
|
a5bd9f6 |
grub-core/disk/cryptodisk.c | 2 +-
|
|
|
a5bd9f6 |
grub-core/disk/efi/efidisk.c | 2 +-
|
|
|
a5bd9f6 |
grub-core/disk/geli.c | 2 +-
|
|
|
a5bd9f6 |
4 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 3431895..7e2a62f 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,9 @@
|
|
|
a5bd9f6 |
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ Replace 8 with GRUB_CHAR_BIT in several places when appropriate.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
Add new defines GRUB_RSDP_SIGNATURE_SIZE and GRUB_RSDP_SIGNATURE.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
index 374edd1..5b12a23 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
@@ -103,7 +103,7 @@ gf_mul_be (grub_uint8_t *o, const grub_uint8_t *a, const grub_uint8_t *b)
|
|
|
a5bd9f6 |
grub_memcpy (t, b, GRUB_CRYPTODISK_GF_BYTES);
|
|
|
a5bd9f6 |
for (i = 0; i < GRUB_CRYPTODISK_GF_SIZE; i++)
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
- if (((a[GRUB_CRYPTODISK_GF_BYTES - i / 8 - 1] >> (i % 8))) & 1)
|
|
|
a5bd9f6 |
+ if (((a[GRUB_CRYPTODISK_GF_BYTES - i / GRUB_CHAR_BIT - 1] >> (i % GRUB_CHAR_BIT))) & 1)
|
|
|
a5bd9f6 |
grub_crypto_xor (o, o, t, GRUB_CRYPTODISK_GF_BYTES);
|
|
|
a5bd9f6 |
gf_mul_x_be (t);
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
|
|
|
a5bd9f6 |
index 0a364f1..28b9fa1 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/efi/efidisk.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/efi/efidisk.c
|
|
|
a5bd9f6 |
@@ -501,7 +501,7 @@ grub_efidisk_open (const char *name, struct grub_disk *disk)
|
|
|
a5bd9f6 |
if (! d)
|
|
|
a5bd9f6 |
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such device");
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
- disk->id = ((num << 8) | name[0]);
|
|
|
a5bd9f6 |
+ disk->id = ((num << GRUB_CHAR_BIT) | name[0]);
|
|
|
a5bd9f6 |
m = d->block_io->media;
|
|
|
a5bd9f6 |
/* FIXME: Probably it is better to store the block size in the disk,
|
|
|
a5bd9f6 |
and total sectors should be replaced with total blocks. */
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
index 0b94414..55aa5b9 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
@@ -414,7 +414,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
|
|
|
a5bd9f6 |
if (err)
|
|
|
a5bd9f6 |
return err;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
- keysize = grub_le_to_cpu16 (header.keylen) / 8;
|
|
|
a5bd9f6 |
+ keysize = grub_le_to_cpu16 (header.keylen) / GRUB_CHAR_BIT;
|
|
|
a5bd9f6 |
grub_memset (zero, 0, sizeof (zero));
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
grub_puts_ (N_("Attempting to decrypt master key..."));
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|