[Qemu-devel] [PATCH for-2.4] crypto: Fix aes_decrypt_wrapper()

[Qemu-devel] [PATCH for-2.4] crypto: Fix aes_decrypt_wrapper()

[Kevin Wolf]

Commit d3462e3 broke qcow2's encryption functionality by using encrypt
instead of decrypt in the wrapper function it introduces. This was found
by qemu-iotests case 134.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 crypto/cipher-nettle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index a55a8e8..b01cb1c 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -47,7 +47,7 @@ static void aes_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,
 static void aes_decrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,
                                 uint8_t *dst, const uint8_t *src)
 {
-    aes_encrypt(ctx, length, dst, src);
+    aes_decrypt(ctx, length, dst, src);
 }
 
 static void des_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH for-2.4] crypto: Fix aes_decrypt_wrapper()

[Daniel P. Berrange]

On Fri, Jul 17, 2015 at 07:48:20PM +0200, Kevin Wolf wrote:
> Commit d3462e3 broke qcow2's encryption functionality by using encrypt
> instead of decrypt in the wrapper function it introduces. This was found
> by qemu-iotests case 134.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  crypto/cipher-nettle.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
> index a55a8e8..b01cb1c 100644
> --- a/crypto/cipher-nettle.c
> +++ b/crypto/cipher-nettle.c
> @@ -47,7 +47,7 @@ static void aes_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,
>  static void aes_decrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,
>                                  uint8_t *dst, const uint8_t *src)
>  {
> -    aes_encrypt(ctx, length, dst, src);
> +    aes_decrypt(ctx, length, dst, src);
>  }
>  
>  static void des_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t length,

  Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Glad I added the iotest 134 for encrypted qcow :-)

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|