[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 2/7] cryptodisk: geli: unify grub_cryptodisk_dev function name
From: |
Glenn Washburn |
Subject: |
[PATCH v8 2/7] cryptodisk: geli: unify grub_cryptodisk_dev function names |
Date: |
Sat, 1 Jan 2022 21:52:55 -0600 |
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
grub-core/disk/geli.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index 23789c43f..5b3a11881 100644
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -240,7 +240,7 @@ grub_util_get_geli_uuid (const char *dev)
#endif
static grub_cryptodisk_t
-configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs)
+geli_scan (grub_disk_t disk, grub_cryptomount_args_t cargs)
{
grub_cryptodisk_t newdev;
struct grub_geli_phdr header;
@@ -395,7 +395,7 @@ configure_ciphers (grub_disk_t disk,
grub_cryptomount_args_t cargs)
}
static grub_err_t
-recover_key (grub_disk_t source, grub_cryptodisk_t dev,
grub_cryptomount_args_t cargs)
+geli_recover_key (grub_disk_t source, grub_cryptodisk_t dev,
grub_cryptomount_args_t cargs)
{
grub_size_t keysize;
grub_uint8_t digest[GRUB_CRYPTO_MAX_MDLEN];
@@ -567,8 +567,8 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev,
grub_cryptomount_args_t
}
struct grub_cryptodisk_dev geli_crypto = {
- .scan = configure_ciphers,
- .recover_key = recover_key
+ .scan = geli_scan,
+ .recover_key = geli_recover_key
};
GRUB_MOD_INIT (geli)
--
2.27.0
- [PATCH v8 0/7] Cryptodisk detached headers and key files, Glenn Washburn, 2022/01/01
- [PATCH v8 1/7] cryptodisk: luks: unify grub_cryptodisk_dev function names, Glenn Washburn, 2022/01/01
- [PATCH v8 2/7] cryptodisk: geli: unify grub_cryptodisk_dev function names,
Glenn Washburn <=
- [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Glenn Washburn, 2022/01/01
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Glenn Washburn, 2022/01/04
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Glenn Washburn, 2022/01/04
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Dmitry, 2022/01/04
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Dmitry, 2022/01/04
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Dmitry, 2022/01/04
- Re: [PATCH v8 3/7] cryptodisk: enable the backends to implement detached headers, Glenn Washburn, 2022/01/04
[PATCH v8 4/7] cryptodisk: add support for LUKS1 detached headers, Glenn Washburn, 2022/01/01
[PATCH v8 5/7] cryptodisk: enable the backends to implement key files, Glenn Washburn, 2022/01/01