diff mbox

[for-2.4] crypto: Fix aes_decrypt_wrapper()

Message ID 1437155300-25076-1-git-send-email-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf July 17, 2015, 5:48 p.m. UTC
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(-)

Comments

Daniel P. Berrangé July 17, 2015, 5:50 p.m. UTC | #1
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
diff mbox

Patch

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,