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

luks: Show the JSON information for LUKSv2

Browse Source 
Extract the full information for version 2, which is JSON format. Show
this with the 'luks info' command.

Use the mmc12 disk to check this.

Require the JSON for LUKS.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-10-23 13:22:56 +01:00
parent eb2ae89f55
commit 22826bf21f
4 changed files with 165 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/block/Kconfig
View File

@@ -278,6 +278,7 @@ config BLK_LUKS
select SHA256
select PBKDF2
select PKCS5_MBEDTLS if MBEDTLS_LIB_CRYPTO
select JSON
help
This provides support for detecting and decrypting LUKS (Linux Unified
Key Setup) encrypted partitions. LUKS is a disk encryption specification

23
drivers/block/luks.c
View File

@@ -8,6 +8,7 @@
#include <blk.h>
#include <dm.h>
#include <hexdump.h>
#include <json.h>
#include <log.h>
#include <luks.h>
#include <memalign.h>
@@ -103,6 +104,28 @@ int luks_show_info(struct udevice *blk, struct disk_partition *pinfo)
printf("UUID: %.40s\n", luks2_hdr->uuid);
printf("Label: %.48s\n", luks2_hdr->label);
printf("Checksum alg: %.32s\n", luks2_hdr->csum_alg);
if (IS_ENABLED(CONFIG_JSON)) {
u64 json_size;
char *json_start;
int blocks;
/* Read the full header to get JSON area */
blocks = (hdr_size + desc->blksz - 1) / desc->blksz;
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, full_hdr, blocks * desc->blksz);
if (blk_read(blk, pinfo->start, blocks, full_hdr) != blocks) {
printf("Error: failed to read full LUKS2 header\n");
return -EIO;
}
/* JSON starts after the 4096-byte binary header */
json_start = (char *)(full_hdr + 4096);
json_size = hdr_size - 4096;
printf("\nJSON metadata (%llx bytes):\n", json_size);
json_print_pretty(json_start, (int)json_size);
}
} else {
printf("Unknown LUKS version\n");
return -EPROTONOSUPPORT;