From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1knI4r-0008Jh-Ed for mharc-grub-devel@gnu.org; Thu, 10 Dec 2020 04:17:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knI4m-0008EP-D3 for grub-devel@gnu.org; Thu, 10 Dec 2020 04:17:28 -0500 Received: from cyberdimension.org ([2001:910:1314:ffff::1]:38666 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1knI4k-0005uK-M5 for grub-devel@gnu.org; Thu, 10 Dec 2020 04:17:28 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id d961a89f; Thu, 10 Dec 2020 09:14:04 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 36b5c9d2; Thu, 10 Dec 2020 09:14:03 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli Subject: [PATCH v7 2/6] cryptodisk: geli: unify grub_cryptodisk_dev function names Date: Thu, 10 Dec 2020 10:14:55 +0100 Message-Id: <20201210091459.11154-3-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201210091459.11154-1-GNUtoo@cyberdimension.org> References: <20201210091459.11154-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:910:1314:ffff::1; envelope-from=GNUtoo@cyberdimension.org; helo=gnutoo.cyberdimension.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 09:17:28 -0000 Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-by: Patrick Steinhardt --- 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