From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jWplg-0007Bu-Lq for mharc-grub-devel@gnu.org; Thu, 07 May 2020 19:17:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWplf-0007AI-3d for grub-devel@gnu.org; Thu, 07 May 2020 19:17:27 -0400 Received: from cyberdimension.org ([80.67.179.20]:39070 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jWplc-0001Uv-MO for grub-devel@gnu.org; Thu, 07 May 2020 19:17:26 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 5e5579b6; Thu, 7 May 2020 23:16:18 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 1cfb7086; Thu, 7 May 2020 23:16:18 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli Subject: [Patchv3][ 1/6] cryptodisk: luks: unify grub_cryptodisk_dev function names Date: Fri, 8 May 2020 01:19:38 +0200 Message-Id: <20200507231943.6196-2-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200507231943.6196-1-GNUtoo@cyberdimension.org> References: <20200507231943.6196-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=80.67.179.20; envelope-from=GNUtoo@cyberdimension.org; helo=gnutoo.cyberdimension.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 19:17:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, 07 May 2020 23:17:27 -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.26.2