[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/17] qemu-img/qemu-io: don't prompt for passwor
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 09/17] qemu-img/qemu-io: don't prompt for passwords if not required |
Date: |
Wed, 20 Jan 2016 17:38:51 +0000 |
The qemu-img/qemu-io tools prompt for disk encryption passwords
regardless of whether any are actually required. Adding a check
on bdrv_key_required() avoids this prompt for disk formats which
have been converted to the QCryptoSecret APIs.
This is just a temporary hack to ensure the block I/O tests
continue to work after each patch, since the last patch will
completely delete all the password prompting code.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qemu-img.c | 3 ++-
qemu-io.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index e79f29b..faf4dbd 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -287,7 +287,8 @@ static BlockBackend *img_open_file(const char *id, const
char *filename,
}
bs = blk_bs(blk);
- if (bdrv_is_encrypted(bs) && !(flags & BDRV_O_NO_IO)) {
+ if (bdrv_is_encrypted(bs) && bdrv_key_required(bs) &&
+ !(flags & BDRV_O_NO_IO)) {
qprintf(quiet, "Disk image '%s' is encrypted.\n", filename);
if (qemu_read_password(password, sizeof(password)) < 0) {
error_report("No password given");
diff --git a/qemu-io.c b/qemu-io.c
index 1c20e9b..98b5cc2 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -72,7 +72,7 @@ static int openfile(char *name, int flags, QDict *opts)
}
bs = blk_bs(qemuio_blk);
- if (bdrv_is_encrypted(bs)) {
+ if (bdrv_is_encrypted(bs) && bdrv_key_required(bs)) {
char password[256];
printf("Disk image '%s' is encrypted.\n", name);
if (qemu_read_password(password, sizeof(password)) < 0) {
--
2.5.0
- [Qemu-devel] [PATCH v2 00/17] Support LUKS encryption in block devices, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 02/17] crypto: add cryptographic random byte source, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 01/17] crypto: ensure qcrypto_hash_digest_len is always defined, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 03/17] crypto: add support for PBKDF2 algorithm, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 08/17] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 09/17] qemu-img/qemu-io: don't prompt for passwords if not required,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 04/17] crypto: add support for generating initialization vectors, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 05/17] crypto: add support for anti-forensic split algorithm, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 06/17] crypto: add block encryption framework, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 07/17] crypto: implement the LUKS block encryption format, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 13/17] qcow: make encrypt_sectors encrypt in place, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PATCH v2 11/17] qcow2: make qcow2_encrypt_sectors encrypt in place, Daniel P. Berrange, 2016/01/20