diff options
Diffstat (limited to 'libre/grub-crypt-git/v6-0002-cryptodisk-geli-unify-grub_cryptodisk_dev-functio.patch')
-rw-r--r-- | libre/grub-crypt-git/v6-0002-cryptodisk-geli-unify-grub_cryptodisk_dev-functio.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/libre/grub-crypt-git/v6-0002-cryptodisk-geli-unify-grub_cryptodisk_dev-functio.patch b/libre/grub-crypt-git/v6-0002-cryptodisk-geli-unify-grub_cryptodisk_dev-functio.patch new file mode 100644 index 000000000..8576a7b61 --- /dev/null +++ b/libre/grub-crypt-git/v6-0002-cryptodisk-geli-unify-grub_cryptodisk_dev-functio.patch @@ -0,0 +1,49 @@ +From 90f9191faff3f7f4c8f98d0ff6023a8b92069022 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 2/6] cryptodisk: geli: 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/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 e9d23299a..581631c1d 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.28.0 + |