Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jggpf-0007QJ-17 for mharc-grub-devel@gnu.org; Wed, 03 Jun 2020 23:46:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jggpY-0007D7-4C for grub-devel@gnu.org; Wed, 03 Jun 2020 23:46:12 -0400 Received: from cyberdimension.org ([2001:910:1314:ffff::1]:51814 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jggpW-0006NG-VP for grub-devel@gnu.org; Wed, 03 Jun 2020 23:46:11 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id af93fbb3; Thu, 4 Jun 2020 03:42:38 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id f2065b9f; Thu, 4 Jun 2020 03:42:38 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli Subject: [PATCH v4][ 2/6] cryptodisk: geli: unify grub_cryptodisk_dev function names Date: Thu, 4 Jun 2020 05:43:20 +0200 Message-Id: <20200604034324.4565-3-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200604034324.4565-1-GNUtoo@cyberdimension.org> References: <20200604034324.4565-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, 04 Jun 2020 03:46:12 -0000 Signed-off-by: Denis 'GNUtoo' Carikli --- 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.26.2