All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
To: Patrick Steinhardt <ps@pks.im>,
	Daniel Kiper <daniel.kiper@oracle.com>,
	Glenn Washburn <development@efficientek.com>
Cc: The development of GNU GRUB <grub-devel@gnu.org>,
	Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Subject: [PATCH v7 2/6] cryptodisk: geli: unify grub_cryptodisk_dev function names
Date: Thu, 10 Dec 2020 10:14:55 +0100	[thread overview]
Message-ID: <20201210091459.11154-3-GNUtoo@cyberdimension.org> (raw)
In-Reply-To: <20201210091459.11154-1-GNUtoo@cyberdimension.org>

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
ChangeLog since v6:
- No changes
---
 grub-core/disk/geli.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index 0175ce4c4..203a9081b 100644
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -242,8 +242,7 @@ grub_util_get_geli_uuid (const char *dev)
 #endif
 
 static grub_cryptodisk_t
-configure_ciphers (grub_disk_t disk, const char *check_uuid,
-		   int boot_only)
+geli_scan (grub_disk_t disk, const char *check_uuid, int boot_only)
 {
   grub_cryptodisk_t newdev;
   struct grub_geli_phdr header;
@@ -398,7 +397,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
 }
 
 static grub_err_t
-recover_key (grub_disk_t source, grub_cryptodisk_t dev)
+geli_recover_key (grub_disk_t source, grub_cryptodisk_t dev)
 {
   grub_size_t keysize;
   grub_uint8_t digest[GRUB_CRYPTO_MAX_MDLEN];
@@ -580,8 +579,8 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
 }
 
 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.29.2



  parent reply	other threads:[~2020-12-10  9:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-10  9:14 v7 for detached headers and key files Denis 'GNUtoo' Carikli
2020-12-10  9:14 ` [PATCH v7 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function names Denis 'GNUtoo' Carikli
2020-12-10  9:14 ` Denis 'GNUtoo' Carikli [this message]
2020-12-10  9:14 ` [PATCH v7 3/6] cryptodisk: enable the backends to implement detached headers Denis 'GNUtoo' Carikli
2020-12-10  9:14 ` [PATCH v7 4/6] cryptodisk: add support for LUKS1 " Denis 'GNUtoo' Carikli
2020-12-10  9:14 ` [PATCH v7 5/6] cryptodisk: enable the backends to implement key files Denis 'GNUtoo' Carikli
2020-12-10  9:14 ` [PATCH v7 6/6] cryptodisk: Add support for LUKS1 " Denis 'GNUtoo' Carikli
2020-12-16 18:35 ` v7 for detached headers and " Glenn Washburn
2020-12-17  0:27   ` Denis 'GNUtoo' Carikli
2021-08-17 22:30 ` Denis 'GNUtoo' Carikli
2021-08-26 18:06   ` Daniel Kiper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201210091459.11154-3-GNUtoo@cyberdimension.org \
    --to=gnutoo@cyberdimension.org \
    --cc=daniel.kiper@oracle.com \
    --cc=development@efficientek.com \
    --cc=grub-devel@gnu.org \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.