ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: Introduce 'detached-header' field in QCryptoBlockInfoLUKS 

When querying the LUKS disk with the qemu-img tool or other APIs,
add information about whether the LUKS header is detached.

Additionally, update the test case with the appropriate
modification.

Signed-off-by: Hyman Huang <yong.huang@smartx.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Hyman Huang 2024-01-30 13:37:24 +08:00 committed by Daniel P. Berrangé
parent 35286daeca
commit 0bd779e27e
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/block-luks.c
View File

@ -1271,6 +1271,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
block->sector_size = QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; block->sector_size = QCRYPTO_BLOCK_LUKS_SECTOR_SIZE;
block->payload_offset = luks->header.payload_offset_sector * block->payload_offset = luks->header.payload_offset_sector *
block->sector_size; block->sector_size;
block->detached_header = (block->payload_offset == 0) ? true : false;
return 0; return 0;
@ -1895,6 +1896,7 @@ static int qcrypto_block_luks_get_info(QCryptoBlock *block,
info->u.luks.master_key_iters = luks->header.master_key_iterations; info->u.luks.master_key_iters = luks->header.master_key_iterations;
info->u.luks.uuid = g_strndup((const char *)luks->header.uuid, info->u.luks.uuid = g_strndup((const char *)luks->header.uuid,
sizeof(luks->header.uuid)); sizeof(luks->header.uuid));
info->u.luks.detached_header = block->detached_header;
for (i = 0; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS; i++) { for (i = 0; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS; i++) {
slot = g_new0(QCryptoBlockInfoLUKSSlot, 1); slot = g_new0(QCryptoBlockInfoLUKSSlot, 1);

3
qapi/crypto.json
View File

@ -317,6 +317,8 @@
# #
# @hash-alg: the master key hash algorithm # @hash-alg: the master key hash algorithm
# #
# @detached-header: whether the LUKS header is detached (Since 9.0)
#
# @payload-offset: offset to the payload data in bytes # @payload-offset: offset to the payload data in bytes
# #
# @master-key-iters: number of PBKDF2 iterations for key material # @master-key-iters: number of PBKDF2 iterations for key material
@ -333,6 +335,7 @@
'ivgen-alg': 'QCryptoIVGenAlgorithm', 'ivgen-alg': 'QCryptoIVGenAlgorithm',
'*ivgen-hash-alg': 'QCryptoHashAlgorithm', '*ivgen-hash-alg': 'QCryptoHashAlgorithm',
'hash-alg': 'QCryptoHashAlgorithm', 'hash-alg': 'QCryptoHashAlgorithm',
'detached-header': 'bool',
'payload-offset': 'int', 'payload-offset': 'int',
'master-key-iters': 'int', 'master-key-iters': 'int',
'uuid': 'str', 'uuid': 'str',

4
tests/qemu-iotests/210.out
View File

@ -18,6 +18,7 @@ virtual size: 128 MiB (134217728 bytes)
encrypted: yes encrypted: yes
Format specific information: Format specific information:
ivgen alg: plain64 ivgen alg: plain64
detached header: false
hash alg: sha256 hash alg: sha256
cipher alg: aes-256 cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@ -70,6 +71,7 @@ virtual size: 64 MiB (67108864 bytes)
encrypted: yes encrypted: yes
Format specific information: Format specific information:
ivgen alg: plain64 ivgen alg: plain64
detached header: false
hash alg: sha1 hash alg: sha1
cipher alg: aes-128 cipher alg: aes-128
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@ -125,6 +127,7 @@ virtual size: 0 B (0 bytes)
encrypted: yes encrypted: yes
Format specific information: Format specific information:
ivgen alg: plain64 ivgen alg: plain64
detached header: false
hash alg: sha256 hash alg: sha256
cipher alg: aes-256 cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@ -195,6 +198,7 @@ virtual size: 0 B (0 bytes)
encrypted: yes encrypted: yes
Format specific information: Format specific information:
ivgen alg: plain64 ivgen alg: plain64
detached header: false
hash alg: sha256 hash alg: sha256
cipher alg: aes-256 cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX