[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 05/12] qcrypto-luks: pass keyslot index rather that
From: |
Maxim Levitsky |
Subject: |
[Qemu-block] [PATCH 05/12] qcrypto-luks: pass keyslot index rather that pointer to the keyslot |
Date: |
Thu, 12 Sep 2019 12:17:03 +0300 |
Another minor refactoring
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
crypto/block-luks.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 9e59a791a6..b759cc8d19 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -410,7 +410,7 @@ qcrypto_block_luks_essiv_cipher(QCryptoCipherAlgorithm
cipher,
*/
static int
qcrypto_block_luks_load_key(QCryptoBlock *block,
- QCryptoBlockLUKSKeySlot *slot,
+ size_t slot_idx,
const char *password,
QCryptoCipherAlgorithm cipheralg,
QCryptoCipherMode ciphermode,
@@ -424,6 +424,7 @@ qcrypto_block_luks_load_key(QCryptoBlock *block,
Error **errp)
{
QCryptoBlockLUKS *luks = block->opaque;
+ const QCryptoBlockLUKSKeySlot *slot = &luks->header.key_slots[slot_idx];
g_autofree uint8_t *splitkey = NULL;
size_t splitkeylen;
g_autofree uint8_t *possiblekey = NULL;
@@ -580,13 +581,12 @@ qcrypto_block_luks_find_key(QCryptoBlock *block,
void *opaque,
Error **errp)
{
- QCryptoBlockLUKS *luks = block->opaque;
size_t i;
int rv;
for (i = 0; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS; i++) {
rv = qcrypto_block_luks_load_key(block,
- &luks->header.key_slots[i],
+ i,
password,
cipheralg,
ciphermode,
--
2.17.2
- [Qemu-block] [PATCH 00/12] crypto/luks: preparation for encryption key managment, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 01/12] block-crypto: misc refactoring, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 02/12] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 03/12] qcrypto-luks: don't overwrite cipher_mode in header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 05/12] qcrypto-luks: pass keyslot index rather that pointer to the keyslot,
Maxim Levitsky <=
- [Qemu-block] [PATCH 04/12] qcrypto-luks: simplify masterkey and masterkey length, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 06/12] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 08/12] qcrypto-luks: extract store and load header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 09/12] qcrypto-luks: extract check and parse header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 10/12] qcrypto-luks: extract store key function, Maxim Levitsky, 2019/09/12