Commit 0270417c authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Daniel P. Berrangé
Browse files

crypto/block: rename qcrypto_block_*crypt_helper 



Rename qcrypto_block_*crypt_helper to qcrypto_block_cipher_*crypt_helper,
as it's not about QCryptoBlock. This is needed to introduce
qcrypto_block_*crypt_helper in the next commit, which will have
QCryptoBlock pointer and than will be able to use additional fields of
it, which in turn will be used to implement thread-safe QCryptoBlock
operations.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 1dc57b60

crypto/block-luks.c

+22 −22
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ qcrypto_block_luks_load_key(QCryptoBlock *block, 
     * to reset the encryption cipher every time the master

     * key crosses a sector boundary.

     */

    if (qcrypto_block_decrypt_helper(cipher,

    if (qcrypto_block_cipher_decrypt_helper(cipher,

                                            niv,

                                            ivgen,

                                            QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
@@ -1219,7 +1219,7 @@ qcrypto_block_luks_create(QCryptoBlock *block, 


    /* Now we encrypt the split master key with the key generated

     * from the user's password, before storing it */

    if (qcrypto_block_encrypt_helper(cipher, block->niv, ivgen,

    if (qcrypto_block_cipher_encrypt_helper(cipher, block->niv, ivgen,

                                            QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,

                                            0,

                                            splitkey,
@@ -1409,7 +1409,7 @@ qcrypto_block_luks_decrypt(QCryptoBlock *block, 
{

    assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));

    assert(QEMU_IS_ALIGNED(len, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));

    return qcrypto_block_decrypt_helper(block->cipher,

    return qcrypto_block_cipher_decrypt_helper(block->cipher,

                                               block->niv, block->ivgen,

                                               QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,

                                               offset, buf, len, errp);
@@ -1425,7 +1425,7 @@ qcrypto_block_luks_encrypt(QCryptoBlock *block, 
{

    assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));

    assert(QEMU_IS_ALIGNED(len, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));

    return qcrypto_block_encrypt_helper(block->cipher,

    return qcrypto_block_cipher_encrypt_helper(block->cipher,

                                               block->niv, block->ivgen,

                                               QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,

                                               offset, buf, len, errp);

crypto/block-qcow.c

+8 −8
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ qcrypto_block_qcow_decrypt(QCryptoBlock *block, 
{

    assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));

    assert(QEMU_IS_ALIGNED(len, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));

    return qcrypto_block_decrypt_helper(block->cipher,

    return qcrypto_block_cipher_decrypt_helper(block->cipher,

                                               block->niv, block->ivgen,

                                               QCRYPTO_BLOCK_QCOW_SECTOR_SIZE,

                                               offset, buf, len, errp);
@@ -168,7 +168,7 @@ qcrypto_block_qcow_encrypt(QCryptoBlock *block, 
{

    assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));

    assert(QEMU_IS_ALIGNED(len, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));

    return qcrypto_block_encrypt_helper(block->cipher,

    return qcrypto_block_cipher_encrypt_helper(block->cipher,

                                               block->niv, block->ivgen,

                                               QCRYPTO_BLOCK_QCOW_SECTOR_SIZE,

                                               offset, buf, len, errp);

crypto/block.c

+36 −34
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ typedef int (*QCryptoCipherEncDecFunc)(QCryptoCipher *cipher, 
                                        size_t len,

                                        Error **errp);



static int do_qcrypto_block_encdec(QCryptoCipher *cipher,

static int do_qcrypto_block_cipher_encdec(QCryptoCipher *cipher,

                                          size_t niv,

                                          QCryptoIVGen *ivgen,

                                          int sectorsize,
@@ -249,7 +249,7 @@ static int do_qcrypto_block_encdec(QCryptoCipher *cipher, 
}





int qcrypto_block_decrypt_helper(QCryptoCipher *cipher,

int qcrypto_block_cipher_decrypt_helper(QCryptoCipher *cipher,

                                        size_t niv,

                                        QCryptoIVGen *ivgen,

                                        int sectorsize,
@@ -258,12 +258,13 @@ int qcrypto_block_decrypt_helper(QCryptoCipher *cipher, 
                                        size_t len,

                                        Error **errp)

{

    return do_qcrypto_block_encdec(cipher, niv, ivgen, sectorsize, offset,

                                   buf, len, qcrypto_cipher_decrypt, errp);

    return do_qcrypto_block_cipher_encdec(cipher, niv, ivgen, sectorsize,

                                          offset, buf, len,

                                          qcrypto_cipher_decrypt, errp);

}





int qcrypto_block_encrypt_helper(QCryptoCipher *cipher,

int qcrypto_block_cipher_encrypt_helper(QCryptoCipher *cipher,

                                        size_t niv,

                                        QCryptoIVGen *ivgen,

                                        int sectorsize,
@@ -272,6 +273,7 @@ int qcrypto_block_encrypt_helper(QCryptoCipher *cipher, 
                                        size_t len,

                                        Error **errp)

{

    return do_qcrypto_block_encdec(cipher, niv, ivgen, sectorsize, offset,

                                   buf, len, qcrypto_cipher_encrypt, errp);

    return do_qcrypto_block_cipher_encdec(cipher, niv, ivgen, sectorsize,

                                          offset, buf, len,

                                          qcrypto_cipher_encrypt, errp);

}

crypto/blockpriv.h

+17 −17
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct QCryptoBlockDriver { 
};





int qcrypto_block_decrypt_helper(QCryptoCipher *cipher,

int qcrypto_block_cipher_decrypt_helper(QCryptoCipher *cipher,

                                        size_t niv,

                                        QCryptoIVGen *ivgen,

                                        int sectorsize,
@@ -87,7 +87,7 @@ int qcrypto_block_decrypt_helper(QCryptoCipher *cipher, 
                                        size_t len,

                                        Error **errp);



int qcrypto_block_encrypt_helper(QCryptoCipher *cipher,

int qcrypto_block_cipher_encrypt_helper(QCryptoCipher *cipher,

                                        size_t niv,

                                        QCryptoIVGen *ivgen,

                                        int sectorsize,