Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-23 15:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptodisk: Rename "total_length" field in grub_cryptodisk_t to "total_sectors"

Browse Source 
This creates an alignment with grub_disk_t naming of the same field and is
more intuitive as to how it should be used.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn authored and Daniel Kiper committed 2020-11-20 15:33:41 +01:00
1 parent f0715577c2
commit 535998c2e0
5 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/disk/cryptodisk.c
+1 -1
View File
@@ -699,7 +699,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
} }
disk->data = dev; disk->data = dev;
disk->total_sectors = dev->total_length; disk->total_sectors = dev->total_sectors;
disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE; disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
disk->id = dev->id; disk->id = dev->id;
dev->ref++; dev->ref++;
grub-core/disk/geli.c
+1 -1
View File
@@ -391,7 +391,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
newdev->modname = "geli"; newdev->modname = "geli";
newdev->total_length = grub_disk_get_size (disk) - 1; newdev->total_sectors = grub_disk_get_size (disk) - 1;
grub_memcpy (newdev->uuid, uuid, sizeof (newdev->uuid)); grub_memcpy (newdev->uuid, uuid, sizeof (newdev->uuid));
COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >= 32 * 2 + 1); COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >= 32 * 2 + 1);
return newdev; return newdev;
grub-core/disk/luks.c
+1 -1
View File
@@ -125,7 +125,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
newdev->offset = grub_be_to_cpu32 (header.payloadOffset); newdev->offset = grub_be_to_cpu32 (header.payloadOffset);
newdev->source_disk = NULL; newdev->source_disk = NULL;
newdev->log_sector_size = 9; newdev->log_sector_size = 9;
newdev->total_length = grub_disk_get_size (disk) - newdev->offset; newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset;
grub_memcpy (newdev->uuid, uuid, sizeof (uuid)); grub_memcpy (newdev->uuid, uuid, sizeof (uuid));
newdev->modname = "luks"; newdev->modname = "luks";
grub-core/disk/luks2.c
+2 -2
View File
@@ -609,9 +609,9 @@ luks2_recover_key (grub_disk_t disk,
crypt->log_sector_size = sizeof (unsigned int) * 8 crypt->log_sector_size = sizeof (unsigned int) * 8
- __builtin_clz ((unsigned int) segment.sector_size) - 1; - __builtin_clz ((unsigned int) segment.sector_size) - 1;
if (grub_strcmp (segment.size, "dynamic") == 0) if (grub_strcmp (segment.size, "dynamic") == 0)
crypt->total_length = grub_disk_get_size (disk) - crypt->offset; crypt->total_sectors = grub_disk_get_size (disk) - crypt->offset;
else else
crypt->total_length = grub_strtoull (segment.size, NULL, 10); crypt->total_sectors = grub_strtoull (segment.size, NULL, 10);
ret = luks2_decrypt_key (candidate_key, disk, crypt, &keyslot, ret = luks2_decrypt_key (candidate_key, disk, crypt, &keyslot,
(const grub_uint8_t *) passphrase, grub_strlen (passphrase)); (const grub_uint8_t *) passphrase, grub_strlen (passphrase));
include/grub/cryptodisk.h
+2 -1
View File
@@ -67,7 +67,8 @@ struct grub_cryptodisk
char *source; char *source;
grub_disk_addr_t offset; grub_disk_addr_t offset;
grub_disk_addr_t total_length; /* Total number of encrypted sectors of size (1 << log_sector_size). */
grub_disk_addr_t total_sectors;
grub_disk_t source_disk; grub_disk_t source_disk;
int ref; int ref;
grub_crypto_cipher_handle_t cipher; grub_crypto_cipher_handle_t cipher;