diff options
| author | Maxim Levitsky | 2019-09-25 23:35:19 +0200 |
|---|---|---|
| committer | Daniel P. Berrangé | 2019-09-26 17:34:02 +0200 |
| commit | 7e60a6f53d8ec403e5493ba5858543a389f58aee (patch) | |
| tree | 23f8b47f0ec6565c440b8636638b49fcbcce1453 | |
| parent | qcrypto-luks: simplify masterkey and masterkey length (diff) | |
| download | qemu-7e60a6f53d8ec403e5493ba5858543a389f58aee.tar.gz qemu-7e60a6f53d8ec403e5493ba5858543a389f58aee.tar.xz qemu-7e60a6f53d8ec403e5493ba5858543a389f58aee.zip | |
qcrypto-luks: pass keyslot index rather that pointer to the keyslot
Another minor refactoring
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | crypto/block-luks.c | 6 |
1 files 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, |