[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/11] qcrypto-luks: pass keyslot index rather that pointer to the
From: |
Daniel P . Berrangé |
Subject: |
[PULL 04/11] qcrypto-luks: pass keyslot index rather that pointer to the keyslot |
Date: |
Fri, 27 Sep 2019 10:59:19 +0100 |
From: Maxim Levitsky <address@hidden>
Another minor refactoring
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-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.21.0
- [PULL 00/11] Qcrypto next patches, Daniel P . Berrangé, 2019/09/27
- [PULL 03/11] qcrypto-luks: simplify masterkey and masterkey length, Daniel P . Berrangé, 2019/09/27
- [PULL 05/11] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Daniel P . Berrangé, 2019/09/27
- [PULL 11/11] qcrypto-luks: more rigorous header checking, Daniel P . Berrangé, 2019/09/27
- [PULL 04/11] qcrypto-luks: pass keyslot index rather that pointer to the keyslot,
Daniel P . Berrangé <=
- [PULL 08/11] qcrypto-luks: extract check and parse header, Daniel P . Berrangé, 2019/09/27
- [PULL 09/11] qcrypto-luks: extract store key function, Daniel P . Berrangé, 2019/09/27
- [PULL 07/11] qcrypto-luks: extract store and load header, Daniel P . Berrangé, 2019/09/27
- [PULL 01/11] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Daniel P . Berrangé, 2019/09/27
- [PULL 06/11] qcrypto-luks: purge unused error codes from open callback, Daniel P . Berrangé, 2019/09/27
- [PULL 10/11] qcrypto-luks: simplify the math used for keyslot locations, Daniel P . Berrangé, 2019/09/27
- [PULL 02/11] qcrypto-luks: don't overwrite cipher_mode in header, Daniel P . Berrangé, 2019/09/27
- Re: [PULL 00/11] Qcrypto next patches, Peter Maydell, 2019/09/30