From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n3rvw-0000gT-Si for mharc-grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3rvv-0000fu-8V for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:23 -0500 Received: from [2607:f8b0:4864:20::f2f] (port=44978 helo=mail-qv1-xf2f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3rvt-0007G5-3C for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:22 -0500 Received: by mail-qv1-xf2f.google.com with SMTP id kd9so27959059qvb.11 for ; Sat, 01 Jan 2022 19:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jt0aeBxftc15OlUB023W4DL42wEd1p8oF4EUnvtHpOE=; b=lcjF99+JAOI+yp/Rx6HOyPzVbQBL07hiIyleSdbYFk4bQdWhXTG4XLLdCTh8bJUdSg c5la7do9R+9k61S7rpiVHZZcChDM88aMI7gvxc7U14tN4ZJ+ZI2TIAqwXtqcbWebwUMZ 7viJKiTEheMqTPQzbjh1SeLh9078xBtXoa4fxTkD5c2r3DnzxAc2VHQTpf2ImKXWVv5X 2PsSCVO7shZ2h8TebhvRyjS3XCTD8UJCBAhuVnZV5yYyrkxYo2J2qwvM+EiCeBm4iVWX pvc23/jnDH2NkGiNgrCKVwGAT3xzwMuE1aI9ILFZrdY+o24sT86YR2njJTrorDhRPCl+ tVfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jt0aeBxftc15OlUB023W4DL42wEd1p8oF4EUnvtHpOE=; b=tX2LaN+T/fczt4gv7Iahlvb/08AihHGo4bNvV6923Cfa7CmAS29ORqJ2XTaPzI/bsL fMyAXz5TciCOt1AVjhk1cx7aR7DHrS/2ETi3MZAmf6O3hJlFuTvoz2Dst5aCo+PmtHn2 btGNFfe3wvp76FAslwEJMDN/zHZ9VSXFVgO5FPTWe3O7I3znHcP/bjY4SglwK9U1jNeA vqthx0NmT9rMOPY0H2AA4Ql0e6seTv3EuT6UqZsLBpnCd0buorLpkuSgL4fdtnqfKVKP XuOC5LLWW6ZfBNqyG5s8norBzBKHhbWgpQoZRm6bpqjoboDI4HuMuS7xu42NjoBRjaH8 3VPQ== X-Gm-Message-State: AOAM532/yin3taBooiW9aA1kVoIZ8jVARObczfzNAFB/Fp+btvMUT2Oh RPcojwzhKtIo6/wO+B247jsKbw== X-Google-Smtp-Source: ABdhPJy64oQyb/uqnUiXCiRdH3uiBLfh0zmfNUSS8yQgVFNt7P7UWO3tQYaEHzeYc1RUcdrWpsREIg== X-Received: by 2002:a05:6214:628:: with SMTP id a8mr36398539qvx.121.1641095600017; Sat, 01 Jan 2022 19:53:20 -0800 (PST) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id bm25sm25187775qkb.4.2022.01.01.19.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 19:53:19 -0800 (PST) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Denis 'GNUtoo' Carikli , Patrick Steinhardt , John Lane , Glenn Washburn Subject: [PATCH v8 0/7] Cryptodisk detached headers and key files Date: Sat, 1 Jan 2022 21:52:53 -0600 Message-Id: X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f2f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f2f; envelope-from=development@efficientek.com; helo=mail-qv1-xf2f.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jan 2022 03:53:23 -0000 This patch series is an updated version of the v7 sent by Denis Carikli with modifications to reflect changes in argument passing to crypto backends. The previous patch #6 titled "Add support for LUKS1 key files" has been removed as its not needed anymore. Patches #6 and #7 are new, for updating the cryptomount help string and adding support for detached headers in the LUKS2 crypto backend, respectively. I modified the commit tags from v7 as seemed appropriate to me, but they may not be desirable as-is. Glenn Denis 'GNUtoo' Carikli (2): cryptodisk: luks: unify grub_cryptodisk_dev function names cryptodisk: geli: unify grub_cryptodisk_dev function names Glenn Washburn (3): cryptodisk: enable the backends to implement detached headers cryptodisk: Improve cryptomount short help string luks2: Add detached header support John Lane (2): cryptodisk: add support for LUKS1 detached headers cryptodisk: enable the backends to implement key files grub-core/disk/cryptodisk.c | 100 +++++++++++++++++++++++++++++++++++- grub-core/disk/geli.c | 18 +++++-- grub-core/disk/luks.c | 48 +++++++++++++---- grub-core/disk/luks2.c | 59 +++++++++++++++++---- include/grub/cryptodisk.h | 4 ++ include/grub/file.h | 4 ++ 6 files changed, 208 insertions(+), 25 deletions(-) Range-diff against v7: 1: 2ad229622 ! 1: e301e06b2 cryptodisk: luks: unify grub_cryptodisk_dev function names @@ grub-core/disk/luks.c: gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, gr 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) +-configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) ++luks_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) { grub_cryptodisk_t newdev; const char *iptr; 2: f5fd41a71 ! 2: e759d96cd cryptodisk: geli: unify grub_cryptodisk_dev function names @@ grub-core/disk/geli.c: 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) +-configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) ++geli_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) { grub_cryptodisk_t newdev; struct grub_geli_phdr header; -@@ grub-core/disk/geli.c: configure_ciphers (grub_disk_t disk, const char *check_uuid, +@@ grub-core/disk/geli.c: configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) } 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) +-recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs) ++geli_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs) { grub_size_t keysize; grub_uint8_t digest[GRUB_CRYPTO_MAX_MDLEN]; -@@ grub-core/disk/geli.c: recover_key (grub_disk_t source, grub_cryptodisk_t dev) +@@ grub-core/disk/geli.c: recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t } struct grub_cryptodisk_dev geli_crypto = { 3: 365839627 < -: --------- cryptodisk: enable the backends to implement detached headers -: --------- > 3: ee04480ba cryptodisk: enable the backends to implement detached headers 4: 1e1257bb6 ! 4: 69684640b cryptodisk: add support for LUKS1 detached headers @@ Commit message Signed-off-by: John Lane GNUtoo@cyberdimension.org: rebase, small fixes, commit message Signed-off-by: Denis 'GNUtoo' Carikli - Reviewed-by: Patrick Steinhardt + development@efficientek.com: rebase ## grub-core/disk/luks.c ## @@ @@ grub-core/disk/luks.c #include #include #include -@@ grub-core/disk/luks.c: luks_scan (grub_disk_t disk, const char *check_uuid, int check_boot, +@@ grub-core/disk/luks.c: luks_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) char ciphername[sizeof (header.cipherName) + 1]; char ciphermode[sizeof (header.cipherMode) + 1]; char hashspec[sizeof (header.hashSpec) + 1]; - grub_err_t err; - - /* Detached headers are not implemented yet */ -- if (hdr) +- if (cargs->hdr_file) - return NULL; + grub_err_t err = GRUB_ERR_NONE; - if (check_boot) + if (cargs->check_boot) return NULL; /* Read the LUKS header. */ - err = grub_disk_read (disk, 0, 0, sizeof (header), &header); -+ if (hdr) ++ if (cargs->hdr_file) + { -+ if (grub_file_seek (hdr, 0) == (grub_off_t) -1) ++ if (grub_file_seek (cargs->hdr_file, 0) == (grub_off_t) -1) + return NULL; + -+ if (grub_file_read (hdr, &header, sizeof (header)) != sizeof (header)) ++ if (grub_file_read (cargs->hdr_file, &header, sizeof (header)) != sizeof (header)) + return NULL; + } + else @@ grub-core/disk/luks.c: luks_scan (grub_disk_t disk, const char *check_uuid, int if (err) { if (err == GRUB_ERR_OUT_OF_RANGE) -@@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_file_t hdr) +@@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, 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 (cargs->key_data == NULL || cargs->key_len == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "no key data"); + - /* Detached headers are not implemented yet */ - if (hdr) -- return GRUB_ERR_NOT_IMPLEMENTED_YET; + if (cargs->hdr_file) +- return GRUB_ERR_NOT_IMPLEMENTED_YET; + { -+ if (grub_file_seek (hdr, 0) == (grub_off_t) -1) ++ if (grub_file_seek (cargs->hdr_file, 0) == (grub_off_t) -1) + return grub_errno; + -+ if (grub_file_read (hdr, &header, sizeof (header)) != sizeof (header)) ++ if (grub_file_read (cargs->hdr_file, &header, sizeof (header)) != sizeof (header)) + return grub_errno; + } + else @@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, grub_cryptodisk_t d if (err) return err; -@@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_file_t hdr) +@@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, return grub_crypto_gcry_error (gcry_err); } @@ grub-core/disk/luks.c: luks_recover_key (grub_disk_t source, grub_cryptodisk_t d - grub_be_to_cpu32 (header.keyblock - [i].keyMaterialOffset), 0, - length, split_key); -+ if (hdr) ++ if (cargs->hdr_file) + { -+ if (grub_file_seek (hdr, sector * 512) == (grub_off_t) -1) ++ if (grub_file_seek (cargs->hdr_file, sector * 512) == (grub_off_t) -1) + return grub_errno; -+ if (grub_file_read (hdr, split_key, length) != (grub_ssize_t)length) ++ if (grub_file_read (cargs->hdr_file, split_key, length) != (grub_ssize_t)length) + return grub_errno; + } + else 5: a8b8c3f45 < -: --------- cryptodisk: enable the backends to implement key files 6: 91a3795cc < -: --------- cryptodisk: Add support for LUKS1 key files -: --------- > 5: ded97bfa3 cryptodisk: enable the backends to implement key files -: --------- > 6: 62f04499c cryptodisk: Improve cryptomount short help string -: --------- > 7: 117658d72 luks2: Add detached header support -- 2.27.0