OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-12-07 19:13:49 +03:00 committed by Daniel P. Berrangé
parent 1dc57b6038
commit 0270417c87
4 changed files with 81 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crypto/block-luks.c
View File

@ -504,14 +504,14 @@ qcrypto_block_luks_load_key(QCryptoBlock *block,
* to reset the encryption cipher every time the master * to reset the encryption cipher every time the master
* key crosses a sector boundary. * key crosses a sector boundary.
*/ */
if (qcrypto_block_decrypt_helper(cipher, if (qcrypto_block_cipher_decrypt_helper(cipher,
niv, niv,
ivgen, ivgen,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
0, 0,
splitkey, splitkey,
splitkeylen, splitkeylen,
errp) < 0) { errp) < 0) {
goto cleanup; goto cleanup;
} }
@ -1219,12 +1219,12 @@ qcrypto_block_luks_create(QCryptoBlock *block,
/* Now we encrypt the split master key with the key generated /* Now we encrypt the split master key with the key generated
* from the user's password, before storing it */ * 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, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
0, 0,
splitkey, splitkey,
splitkeylen, splitkeylen,
errp) < 0) { errp) < 0) {
goto error; goto error;
} }
@ -1409,10 +1409,10 @@ qcrypto_block_luks_decrypt(QCryptoBlock *block,
{ {
assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)); assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));
assert(QEMU_IS_ALIGNED(len, 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, block->niv, block->ivgen,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
offset, buf, len, errp); offset, buf, len, errp);
} }
@ -1425,10 +1425,10 @@ qcrypto_block_luks_encrypt(QCryptoBlock *block,
{ {
assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)); assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE));
assert(QEMU_IS_ALIGNED(len, 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, block->niv, block->ivgen,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
offset, buf, len, errp); offset, buf, len, errp);
} }

16
crypto/block-qcow.c
View File

@ -152,10 +152,10 @@ qcrypto_block_qcow_decrypt(QCryptoBlock *block,
{ {
assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE)); assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));
assert(QEMU_IS_ALIGNED(len, 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, block->niv, block->ivgen,
QCRYPTO_BLOCK_QCOW_SECTOR_SIZE, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE,
offset, buf, len, errp); offset, buf, len, errp);
} }
@ -168,10 +168,10 @@ qcrypto_block_qcow_encrypt(QCryptoBlock *block,
{ {
assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE)); assert(QEMU_IS_ALIGNED(offset, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE));
assert(QEMU_IS_ALIGNED(len, 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, block->niv, block->ivgen,
QCRYPTO_BLOCK_QCOW_SECTOR_SIZE, QCRYPTO_BLOCK_QCOW_SECTOR_SIZE,
offset, buf, len, errp); offset, buf, len, errp);
} }

68
crypto/block.c
View File

@ -191,20 +191,20 @@ void qcrypto_block_free(QCryptoBlock *block)
typedef int (*QCryptoCipherEncDecFunc)(QCryptoCipher *cipher, typedef int (*QCryptoCipherEncDecFunc)(QCryptoCipher *cipher,
const void *in, const void *in,
void *out, void *out,
size_t len, size_t len,
Error **errp); Error **errp);
static int do_qcrypto_block_encdec(QCryptoCipher *cipher, static int do_qcrypto_block_cipher_encdec(QCryptoCipher *cipher,
size_t niv, size_t niv,
QCryptoIVGen *ivgen, QCryptoIVGen *ivgen,
int sectorsize, int sectorsize,
uint64_t offset, uint64_t offset,
uint8_t *buf, uint8_t *buf,
size_t len, size_t len,
QCryptoCipherEncDecFunc func, QCryptoCipherEncDecFunc func,
Error **errp) Error **errp)
{ {
uint8_t *iv; uint8_t *iv;
int ret = -1; int ret = -1;
@ -249,29 +249,31 @@ 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, size_t niv,
QCryptoIVGen *ivgen, QCryptoIVGen *ivgen,
int sectorsize, int sectorsize,
uint64_t offset, uint64_t offset,
uint8_t *buf, uint8_t *buf,
size_t len, size_t len,
Error **errp) Error **errp)
{ {
return do_qcrypto_block_encdec(cipher, niv, ivgen, sectorsize, offset, return do_qcrypto_block_cipher_encdec(cipher, niv, ivgen, sectorsize,
buf, len, qcrypto_cipher_decrypt, errp); 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, size_t niv,
QCryptoIVGen *ivgen, QCryptoIVGen *ivgen,
int sectorsize, int sectorsize,
uint64_t offset, uint64_t offset,
uint8_t *buf, uint8_t *buf,
size_t len, size_t len,
Error **errp) Error **errp)
{ {
return do_qcrypto_block_encdec(cipher, niv, ivgen, sectorsize, offset, return do_qcrypto_block_cipher_encdec(cipher, niv, ivgen, sectorsize,
buf, len, qcrypto_cipher_encrypt, errp); offset, buf, len,
qcrypto_cipher_encrypt, errp);
} }

32
crypto/blockpriv.h
View File

@ -78,22 +78,22 @@ struct QCryptoBlockDriver {
}; };
int qcrypto_block_decrypt_helper(QCryptoCipher *cipher, int qcrypto_block_cipher_decrypt_helper(QCryptoCipher *cipher,
size_t niv, size_t niv,
QCryptoIVGen *ivgen, QCryptoIVGen *ivgen,
int sectorsize, int sectorsize,
uint64_t offset, uint64_t offset,
uint8_t *buf, uint8_t *buf,
size_t len, size_t len,
Error **errp); Error **errp);
int qcrypto_block_encrypt_helper(QCryptoCipher *cipher, int qcrypto_block_cipher_encrypt_helper(QCryptoCipher *cipher,
size_t niv, size_t niv,
QCryptoIVGen *ivgen, QCryptoIVGen *ivgen,
int sectorsize, int sectorsize,
uint64_t offset, uint64_t offset,
uint8_t *buf, uint8_t *buf,
size_t len, size_t len,
Error **errp); Error **errp);
#endif /* QCRYPTO_BLOCKPRIV_H */ #endif /* QCRYPTO_BLOCKPRIV_H */