[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 20/26] qcow2: make qcow2_encrypt_sectors encrypt
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 20/26] qcow2: make qcow2_encrypt_sectors encrypt in place |
Date: |
Mon, 15 Feb 2016 16:10:53 +0000 |
Instead of requiring separate input/output buffers for
encrypting data, change qcow2_encrypt_sectors() to assume
use of a single buffer, encrypting in place. The current
callers all used the same buffer for input/output already.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
block/qcow2-cluster.c | 17 +++++------------
block/qcow2.c | 5 ++---
block/qcow2.h | 3 +--
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 3e887e9..3802d37 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -342,12 +342,8 @@ static int count_contiguous_clusters_by_type(int
nb_clusters,
return i;
}
-/* The crypt function is compatible with the linux cryptoloop
- algorithm for < 4 GB images. NOTE: out_buf == in_buf is
- supported */
int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
- uint8_t *out_buf, const uint8_t *in_buf,
- int nb_sectors, bool enc,
+ uint8_t *buf, int nb_sectors, bool enc,
Error **errp)
{
union {
@@ -367,14 +363,12 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t
sector_num,
}
if (enc) {
ret = qcrypto_cipher_encrypt(s->cipher,
- in_buf,
- out_buf,
+ buf, buf,
512,
errp);
} else {
ret = qcrypto_cipher_decrypt(s->cipher,
- in_buf,
- out_buf,
+ buf, buf,
512,
errp);
}
@@ -382,8 +376,7 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t
sector_num,
return -1;
}
sector_num++;
- in_buf += 512;
- out_buf += 512;
+ buf += 512;
}
return 0;
}
@@ -431,7 +424,7 @@ static int coroutine_fn copy_sectors(BlockDriverState *bs,
Error *err = NULL;
assert(s->cipher);
if (qcow2_encrypt_sectors(s, start_sect + n_start,
- iov.iov_base, iov.iov_base, n,
+ iov.iov_base, n,
true, &err) < 0) {
ret = -EIO;
error_free(err);
diff --git a/block/qcow2.c b/block/qcow2.c
index 8babecd..0264df7 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1506,7 +1506,7 @@ static coroutine_fn int qcow2_co_readv(BlockDriverState
*bs, int64_t sector_num,
assert(s->cipher);
Error *err = NULL;
if (qcow2_encrypt_sectors(s, sector_num, cluster_data,
- cluster_data, cur_nr_sectors, false,
+ cur_nr_sectors, false,
&err) < 0) {
error_free(err);
ret = -EIO;
@@ -1606,8 +1606,7 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState
*bs,
qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size);
if (qcow2_encrypt_sectors(s, sector_num, cluster_data,
- cluster_data, cur_nr_sectors,
- true, &err) < 0) {
+ cur_nr_sectors, true, &err) < 0) {
error_free(err);
ret = -EIO;
goto fail;
diff --git a/block/qcow2.h b/block/qcow2.h
index a063a3c..ae04285 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -540,8 +540,7 @@ int qcow2_write_l1_entry(BlockDriverState *bs, int
l1_index);
void qcow2_l2_cache_reset(BlockDriverState *bs);
int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
- uint8_t *out_buf, const uint8_t *in_buf,
- int nb_sectors, bool enc, Error **errp);
+ uint8_t *buf, int nb_sectors, bool enc, Error
**errp);
int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
int *num, uint64_t *cluster_offset);
--
2.5.0
- [Qemu-devel] [PATCH v3 07/26] crypto: add support for the serpent cipher algorithm, (continued)
- [Qemu-devel] [PATCH v3 07/26] crypto: add support for the serpent cipher algorithm, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 08/26] crypto: add support for the twofish cipher algorithm, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 10/26] crypto: refactor code for dealing with AES cipher, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 15/26] qemu-img/qemu-io: don't prompt for passwords if not required, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 14/26] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 09/26] crypto: import an implementation of the XTS cipher mode, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 12/26] crypto: add block encryption framework, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 17/26] tests: refactor python I/O tests helper main method, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 11/26] crypto: wire up XTS mode for cipher APIs, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 18/26] tests: add output filter to python I/O tests helper, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 20/26] qcow2: make qcow2_encrypt_sectors encrypt in place,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 22/26] qcow: make encrypt_sectors encrypt in place, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 13/26] crypto: implement the LUKS block encryption format, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 16/26] tests: redirect stderr to stdout for iotests, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 24/26] block: rip out all traces of password prompting, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 23/26] qcow: convert QCow to use QCryptoBlock for encryption, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 25/26] block: remove all encryption handling APIs, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 21/26] qcow2: convert QCow2 to use QCryptoBlock for encryption, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 26/26] block: remove support for legecy AES qcow/qcow2 encryption, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v3 19/26] block: add generic full disk encryption driver, Daniel P. Berrange, 2016/02/15