Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jE76A-0008BF-BW for mharc-grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48925) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE767-000884-8N for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE766-00006p-1e for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:11 -0400 Received: from cyberdimension.org ([2001:910:1314:ffff::1]:53664 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 1jE765-000824-NF for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:09 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id f6422dcf; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id ea01b583; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper Cc: The development of GNU GRUB , John Lane , Denis 'GNUtoo' Carikli Subject: [PATCHv2][ 4/6] cryptodisk: add support for LUKS1 detached headers Date: Tue, 17 Mar 2020 08:57:38 +0100 Message-Id: <20200317075740.5430-4-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317075740.5430-1-GNUtoo@cyberdimension.org> References: <20200317075740.5430-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:910:1314:ffff::1 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:12 -0000 From: John Lane cryptsetup supports having a detached header through the --header command line argument for both LUKS1 and LUKS2. This adds support for LUKS1 detached headers. Signed-off-by: John Lane GNUtoo@cyberdimension.org: rebase, small fixes, commit message Signed-off-by: Denis 'GNUtoo' Carikli --- grub-core/disk/luks.c | 49 +++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index e07a2fef1..0b20908ac 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,7 @@ gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src, static grub_cryptodisk_t luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot, - grub_file_t hdr __attribute__((__unused__))) + grub_file_t hdr) { grub_cryptodisk_t newdev; const char *iptr; @@ -76,13 +77,23 @@ luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot, char ciphername[sizeof (header.cipherName) + 1]; char ciphermode[sizeof (header.cipherMode) + 1]; char hashspec[sizeof (header.hashSpec) + 1]; - grub_err_t err; + grub_err_t err = GRUB_ERR_NONE; if (check_boot) return NULL; /* Read the LUKS header. */ - err = grub_disk_read (disk, 0, 0, sizeof (header), &header); + if (hdr) + { + if (grub_file_seek (hdr, 0) == (grub_off_t) -1) + return NULL; + + if (grub_file_read (hdr, &header, sizeof (header)) != sizeof (header)) + return NULL; + } + else + err = grub_disk_read (disk, 0, 0, sizeof (header), &header); + if (err) { if (err == GRUB_ERR_OUT_OF_RANGE) @@ -150,8 +161,7 @@ luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot, } static grub_err_t -luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, - grub_file_t hdr __attribute__ ((unused))) +luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_file_t hdr) { struct grub_luks_phdr header; grub_size_t keysize; @@ -160,11 +170,22 @@ luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_uint8_t candidate_digest[sizeof (header.mkDigest)]; unsigned i; grub_size_t length; - grub_err_t err; + grub_err_t err = GRUB_ERR_NONE; grub_size_t max_stripes = 1; char *tmp; + grub_uint32_t sector; + + if (hdr) + { + if (grub_file_seek (hdr, 0) == (grub_off_t) -1) + return grub_errno; + + if (grub_file_read (hdr, &header, sizeof (header)) != sizeof (header)) + return grub_errno; + } + else + err = grub_disk_read (source, 0, 0, sizeof (header), &header); - err = grub_disk_read (source, 0, 0, sizeof (header), &header); if (err) return err; @@ -233,13 +254,19 @@ luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, return grub_crypto_gcry_error (gcry_err); } + sector = grub_be_to_cpu32 (header.keyblock[i].keyMaterialOffset); length = (keysize * grub_be_to_cpu32 (header.keyblock[i].stripes)); /* Read and decrypt the key material from the disk. */ - err = grub_disk_read (source, - grub_be_to_cpu32 (header.keyblock - [i].keyMaterialOffset), 0, - length, split_key); + if (hdr) + { + if (grub_file_seek (hdr, sector * 512)) + return grub_errno; + if (grub_file_read (hdr, split_key, length) != (grub_ssize_t)length) + return grub_errno; + } + else + err = grub_disk_read (source, sector, 0, length, split_key); if (err) { grub_free (split_key); -- 2.25.1