diff mbox series

[Concept,03/14] luks: Tidy up debugging of unlock

Message ID	20251116212334.1603490-4-simon.glass@canonical.com
State	New
Headers	Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.166.51; helo=mail-io1-f51.google.com; envelope-from=sjg@chromium.org; receiver=u-boot.org From: Simon Glass <sjg@chromium.org> To: U-Boot Concept <concept@u-boot.org> Date: Sun, 16 Nov 2025 14:23:17 -0700 Message-ID: <20251116212334.1603490-4-simon.glass@canonical.com> In-Reply-To: <20251116212334.1603490-1-simon.glass@canonical.com> References: <20251116212334.1603490-1-simon.glass@canonical.com> MIME-Version: 1.0 Message-ID-Hash: USMBW4XKZNGYVPQ5JMCAV44KYBR7KQRM CC: Simon Glass <simon.glass@canonical.com> Precedence: list Subject: [Concept] [PATCH 03/14] luks: Tidy up debugging of unlock Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/USMBW4XKZNGYVPQ5JMCAV44KYBR7KQRM/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	luks: Integrate support for a TKey \| [Concept,00/14] luks: Integrate support for a TKey [Concept,01/14] test/py: Avoid pulling in Labgrid with tests [Concept,02/14] luks: Make essiv_decrypt() a shared function [Concept,03/14] luks: Tidy up debugging of unlock [Concept,04/14] luks: Update try_keyslot() to allow a bytestring [Concept,05/14] luks: Update unlock_luks2() to take binary passphrase [Concept,06/14] luks: Update luks_unlock() to take binary passphrase [Concept,07/14] luks: Extract PBKDF2 key derivation into separate function [Concept,08/14] luks: Move key derivation to the caller of try_keyslot() [Concept,09/14] luks: Split LUKSv1 unlock code into a separate function [Concept,10/14] luks: Support a pre-derived key with LUKSv1 [Concept,11/14] luks: Support a pre-derived key with LUKSv2 [Concept,12/14] luks: Support a pre-derived key [Concept,13/14] luks: Check for out-of-memory with Argon2 [Concept,14/14] luks: Support disk unlock using a TKey

Commit Message

Simon Glass Nov. 16, 2025, 9:23 p.m. UTC

  Name the derived key as such to avoid confusion. Fix a typo in nearby
log_debug() statement.

Update essiv_decrypt() to have a const * for its first argument.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 drivers/block/luks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/block/luks.c b/drivers/block/luks.c
index a7f5b436e12..94139b4f56d 100644
--- a/drivers/block/luks.c
+++ b/drivers/block/luks.c
@@ -358,7 +358,7 @@  static int try_keyslot(struct udevice *blk, struct disk_partition *pinfo,
 
 	/* Decrypt key material using derived key */
 	log_debug("expand key with key_size*8 %u bits\n", key_size * 8);
-	log_debug_hex("input key (derived_key) full:", derived_key, key_size);
+	log_debug_hex("derived_key", derived_key, key_size);
 
 	aes_expand_key(derived_key, key_size * 8, expkey);
 	log_debug_hex("expanded key [0-15]:", expkey, 16);
@@ -405,7 +405,7 @@  static int try_keyslot(struct udevice *blk, struct disk_partition *pinfo,
 
 	/* Check if the digest matches */
 	if (!memcmp(key_digest, hdr->mk_digest, LUKS_DIGESTSIZE)) {
-		log_debug("Uunlocked with key slot %d\n", slot_idx);
+		log_debug("Unlocked with key slot %d\n", slot_idx);
 		return 0;
 	}
 	log_debug("key slot %d: wrong passphrase\n", slot_idx);