[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX |
Date: |
Fri, 6 Feb 2009 19:08:55 -0200 |
Just to make the code a bit more readable, and get ready to make AES
optional.
Signed-off-by: Eduardo Habkost <address@hidden>
---
block-qcow.c | 3 ++-
block-qcow2.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/block-qcow.c b/block-qcow.c
index 91c53b1..4fdd0d8 100644
--- a/block-qcow.c
+++ b/block-qcow.c
@@ -34,6 +34,7 @@
#define QCOW_CRYPT_NONE 0
#define QCOW_CRYPT_AES 1
+#define QCOW_CRYPT_MAX QCOW_CRYPT_AES
#define QCOW_OFLAG_COMPRESSED (1LL << 63)
@@ -113,7 +114,7 @@ static int qcow_open(BlockDriverState *bs, const char
*filename, int flags)
goto fail;
if (header.size <= 1 || header.cluster_bits < 9)
goto fail;
- if (header.crypt_method > QCOW_CRYPT_AES)
+ if (header.crypt_method > QCOW_CRYPT_MAX)
goto fail;
s->crypt_method_header = header.crypt_method;
if (s->crypt_method_header)
diff --git a/block-qcow2.c b/block-qcow2.c
index 465dcd6..d1503e9 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -51,6 +51,7 @@
#define QCOW_CRYPT_NONE 0
#define QCOW_CRYPT_AES 1
+#define QCOW_CRYPT_MAX QCOW_CRYPT_AES
#define QCOW_MAX_CRYPT_CLUSTERS 32
@@ -228,7 +229,7 @@ static int qcow_open(BlockDriverState *bs, const char
*filename, int flags)
header.cluster_bits < 9 ||
header.cluster_bits > 16)
goto fail;
- if (header.crypt_method > QCOW_CRYPT_AES)
+ if (header.crypt_method > QCOW_CRYPT_MAX)
goto fail;
s->crypt_method_header = header.crypt_method;
if (s->crypt_method_header)
--
1.6.0.2.GIT
- [Qemu-devel] [PATCH 0/9] encryption code changes, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 6/9] vnc: make DES-challenge authentication (aka "VNC auth") optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 2/9] drive_init: Don't try to read passwords before monitor setup, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 7/9] configure: add check for libgcrypt, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/9] monitor_readline: poll pending bottom halves before readline_start(), Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 5/9] qcow: make encryption support optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 1/9] vnc: abort on unknown options, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 8/9] qcow: use libgcrypt AES implementation, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 9/9] vnc: use libgcrypt for DES-challenge authentication, Eduardo Habkost, 2009/02/06
- [Qemu-devel] Re: [PATCH 0/9] encryption code changes, Jan Kiszka, 2009/02/06
- Re: [Qemu-devel] [PATCH 0/9] encryption code changes, Anthony Liguori, 2009/02/06
- Re: [Qemu-devel] [PATCH 0/9] encryption code changes, Daniel P. Berrange, 2009/02/07