Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jE768-00088q-Qt for mharc-grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE766-00087x-3R for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE765-0008PE-18 for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:09 -0400 Received: from cyberdimension.org ([80.67.179.20]:46844 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jE764-00085d-Nc for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:08 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 93bb724b; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 62c22b29; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli Subject: [PATCHv2][ 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function names Date: Tue, 17 Mar 2020 08:57:35 +0100 Message-Id: <20200317075740.5430-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 80.67.179.20 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: Tue, 17 Mar 2020 07:57:11 -0000 Signed-off-by: Denis 'GNUtoo' Carikli --- grub-core/disk/luks.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index 410cd6f84..28585806a 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -65,8 +65,7 @@ gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src, grub_size_t blocknumbers); static grub_cryptodisk_t -configure_ciphers (grub_disk_t disk, const char *check_uuid, - int check_boot) +luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot) { grub_cryptodisk_t newdev; const char *iptr; @@ -310,7 +309,7 @@ luks_recover_key (grub_disk_t source, } struct grub_cryptodisk_dev luks_crypto = { - .scan = configure_ciphers, + .scan = luks_scan, .recover_key = luks_recover_key }; -- 2.25.1