| 123456789101112131415161718192021222324252627282930313233343536373839 |
- From 76e1f305277f7901d9f710c61a78d715b2816035 Mon Sep 17 00:00:00 2001
- From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
- Date: Tue, 10 Mar 2020 04:31:16 +0100
- Subject: [PATCH v6 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function
- names
- Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
- Reviewed-by: Patrick Steinhardt <ps@pks.im>
- ---
- grub-core/disk/luks.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
- diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
- index 6ae162601..b50f6fd02 100644
- --- a/grub-core/disk/luks.c
- +++ b/grub-core/disk/luks.c
- @@ -65,8 +65,7 @@ gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src,
- grub_size_t blocknumbers);
-
- static grub_cryptodisk_t
- -configure_ciphers (grub_disk_t disk, const char *check_uuid,
- - int check_boot)
- +luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot)
- {
- grub_cryptodisk_t newdev;
- const char *iptr;
- @@ -310,7 +309,7 @@ luks_recover_key (grub_disk_t source,
- }
-
- struct grub_cryptodisk_dev luks_crypto = {
- - .scan = configure_ciphers,
- + .scan = luks_scan,
- .recover_key = luks_recover_key
- };
-
- --
- 2.28.0
|
