[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/17] crypto: Introduce 'detached-header' field in QCryptoBlockIn
From: |
Daniel P . Berrangé |
Subject: |
[PULL 16/17] crypto: Introduce 'detached-header' field in QCryptoBlockInfoLUKS |
Date: |
Fri, 9 Feb 2024 14:05:04 +0000 |
From: Hyman Huang <yong.huang@smartx.com>
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>
---
crypto/block-luks.c | 2 ++
qapi/crypto.json | 3 +++
tests/qemu-iotests/210.out | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index ab52c9dce1..3ee928fb5a 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -1271,6 +1271,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
block->sector_size = QCRYPTO_BLOCK_LUKS_SECTOR_SIZE;
block->payload_offset = luks->header.payload_offset_sector *
block->sector_size;
+ block->detached_header = (block->payload_offset == 0) ? true : false;
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.uuid = g_strndup((const char *)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++) {
slot = g_new0(QCryptoBlockInfoLUKSSlot, 1);
diff --git a/qapi/crypto.json b/qapi/crypto.json
index 22c6cce3ae..ad8dd37175 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -317,6 +317,8 @@
#
# @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
#
# @master-key-iters: number of PBKDF2 iterations for key material
@@ -333,6 +335,7 @@
'ivgen-alg': 'QCryptoIVGenAlgorithm',
'*ivgen-hash-alg': 'QCryptoHashAlgorithm',
'hash-alg': 'QCryptoHashAlgorithm',
+ 'detached-header': 'bool',
'payload-offset': 'int',
'master-key-iters': 'int',
'uuid': 'str',
diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out
index 96d9f749dd..94b29b2120 100644
--- a/tests/qemu-iotests/210.out
+++ b/tests/qemu-iotests/210.out
@@ -18,6 +18,7 @@ virtual size: 128 MiB (134217728 bytes)
encrypted: yes
Format specific information:
ivgen alg: plain64
+ detached header: false
hash alg: sha256
cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@@ -70,6 +71,7 @@ virtual size: 64 MiB (67108864 bytes)
encrypted: yes
Format specific information:
ivgen alg: plain64
+ detached header: false
hash alg: sha1
cipher alg: aes-128
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@@ -125,6 +127,7 @@ virtual size: 0 B (0 bytes)
encrypted: yes
Format specific information:
ivgen alg: plain64
+ detached header: false
hash alg: sha256
cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
@@ -195,6 +198,7 @@ virtual size: 0 B (0 bytes)
encrypted: yes
Format specific information:
ivgen alg: plain64
+ detached header: false
hash alg: sha256
cipher alg: aes-256
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
--
2.43.0
- [PULL 07/17] docs: fix highlighting of CPU ABI header rows, (continued)
- [PULL 07/17] docs: fix highlighting of CPU ABI header rows, Daniel P . Berrangé, 2024/02/09
- [PULL 10/17] io: add trace event when cancelling TLS handshake, Daniel P . Berrangé, 2024/02/09
- [PULL 09/17] chardev: close QIOChannel before unref'ing, Daniel P . Berrangé, 2024/02/09
- [PULL 08/17] docs: re-generate x86_64 ABI compatibility CSV, Daniel P . Berrangé, 2024/02/09
- [PULL 11/17] crypto: Support LUKS volume with detached header, Daniel P . Berrangé, 2024/02/09
- [PULL 12/17] qapi: Make parameter 'file' optional for BlockdevCreateOptionsLUKS, Daniel P . Berrangé, 2024/02/09
- [PULL 13/17] crypto: Modify the qcrypto_block_create to support creation flags, Daniel P . Berrangé, 2024/02/09
- [PULL 15/17] block: Support detached LUKS header creation using qemu-img, Daniel P . Berrangé, 2024/02/09
- [PULL 17/17] tests: Add case for LUKS volume with detached header, Daniel P . Berrangé, 2024/02/09
- [PULL 14/17] block: Support detached LUKS header creation using blockdev-create, Daniel P . Berrangé, 2024/02/09
- [PULL 16/17] crypto: Introduce 'detached-header' field in QCryptoBlockInfoLUKS,
Daniel P . Berrangé <=
- Re: [PULL 00/17] Misc fixes patches, Peter Maydell, 2024/02/12