Commit 7e60a6f5 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Daniel P. Berrangé
Browse files

qcrypto-luks: pass keyslot index rather that pointer to the keyslot 



Another minor refactoring

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 1ddd52e4

crypto/block-luks.c

+3 −3
Original line number Diff line number Diff line
@@ -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,