smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luks: Update luks_unlock() to take binary passphrase

Browse Source 
Update luks_unlock() to accept a binary passphrase, to match the LUKS2
implementation.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2025-11-16 10:51:07 -07:00
parent 19354111d0
commit c65703bfb9
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/luks.c
View File

@@ -415,7 +415,8 @@ static int try_keyslot(struct udevice *blk, struct disk_partition *pinfo,
}
int luks_unlock(struct udevice *blk, struct disk_partition *pinfo,
const char *pass, u8 *master_key, u32 *key_size)
const u8 *pass, size_t pass_len, u8 *master_key,
u32 *key_size)
{
uint version, split_key_size, km_blocks, hdr_blocks;
u8 *split_key, *derived_key;
@@ -452,8 +453,8 @@ int luks_unlock(struct udevice *blk, struct disk_partition *pinfo,
version = be16_to_cpu(*(__be16 *)(buffer + LUKS_MAGIC_LEN));
if (version == LUKS_VERSION_2)
return unlock_luks2(blk, pinfo, (const u8 *)pass, strlen(pass),
master_key, key_size);
return unlock_luks2(blk, pinfo, pass, pass_len, master_key,
key_size);
if (version != LUKS_VERSION_1) {
log_debug("unsupported LUKS version %d\n", version);
@@ -516,10 +517,9 @@ int luks_unlock(struct udevice *blk, struct disk_partition *pinfo,
/* Try each key slot */
for (i = 0; i < LUKS_NUMKEYS; i++) {
ret = try_keyslot(blk, pinfo, hdr, i, (const u8 *)pass,
strlen(pass), md_type, *key_size,
derived_key, km, km_blocks, split_key,
candidate_key);
ret = try_keyslot(blk, pinfo, hdr, i, pass, pass_len, md_type,
*key_size, derived_key, km, km_blocks,
split_key, candidate_key);
if (!ret) {
/* Successfully unlocked */