[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function name
From: |
Denis 'GNUtoo' Carikli |
Subject: |
[PATCH v6 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function names |
Date: |
Wed, 19 Aug 2020 17:09:09 +0200 |
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
---
ChangeLog since v4:
- Added Reviewed-by tag
ChangeLog since v5:
- No changes
---
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
- [PATCH] v6 for detached headers and key files, Denis 'GNUtoo' Carikli, 2020/08/19
- [PATCH v6 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function names,
Denis 'GNUtoo' Carikli <=
- [PATCH v6 2/6] cryptodisk: geli: unify grub_cryptodisk_dev function names, Denis 'GNUtoo' Carikli, 2020/08/19
- [PATCH v6 3/6] cryptodisk: enable the backends to implement detached headers, Denis 'GNUtoo' Carikli, 2020/08/19
- [PATCH v6 5/6] cryptodisk: enable the backends to implement key files, Denis 'GNUtoo' Carikli, 2020/08/19
- [PATCH v6 6/6] cryptodisk: Add support for LUKS1 key files, Denis 'GNUtoo' Carikli, 2020/08/19
- [PATCH v6 4/6] cryptodisk: add support for LUKS1 detached headers, Denis 'GNUtoo' Carikli, 2020/08/19
- Re: [PATCH] v6 for detached headers and key files, Glenn Washburn, 2020/08/19