* [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2
@ 2015-07-20 14:54 Kevin Wolf
2015-07-20 14:54 ` [Qemu-devel] [PULL 1/1] crypto: Fix aes_decrypt_wrapper() Kevin Wolf
2015-07-20 16:00 ` [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Kevin Wolf @ 2015-07-20 14:54 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel
The following changes since commit 71358470eec668f5dc53def25e585ce250cea9bf:
Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/vrng-2.4' into staging (2015-07-17 15:22:45 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to bd09594603f1498e7623f0030988b62e2052f7da:
crypto: Fix aes_decrypt_wrapper() (2015-07-20 13:35:45 +0200)
----------------------------------------------------------------
Block layer patches for 2.4.0-rc2
----------------------------------------------------------------
Kevin Wolf (1):
crypto: Fix aes_decrypt_wrapper()
crypto/cipher-nettle.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] [PULL 1/1] crypto: Fix aes_decrypt_wrapper() 2015-07-20 14:54 [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Kevin Wolf @ 2015-07-20 14:54 ` Kevin Wolf 2015-07-20 16:00 ` [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Peter Maydell 1 sibling, 0 replies; 3+ messages in thread From: Kevin Wolf @ 2015-07-20 14:54 UTC (permalink / raw) To: qemu-block; +Cc: kwolf, qemu-devel 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> Reviewed-by: Daniel P. Berrange <berrange@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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 2015-07-20 14:54 [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Kevin Wolf 2015-07-20 14:54 ` [Qemu-devel] [PULL 1/1] crypto: Fix aes_decrypt_wrapper() Kevin Wolf @ 2015-07-20 16:00 ` Peter Maydell 1 sibling, 0 replies; 3+ messages in thread From: Peter Maydell @ 2015-07-20 16:00 UTC (permalink / raw) To: Kevin Wolf; +Cc: QEMU Developers, Qemu-block On 20 July 2015 at 15:54, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit 71358470eec668f5dc53def25e585ce250cea9bf: > > Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/vrng-2.4' into staging (2015-07-17 15:22:45 +0100) > > are available in the git repository at: > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to bd09594603f1498e7623f0030988b62e2052f7da: > > crypto: Fix aes_decrypt_wrapper() (2015-07-20 13:35:45 +0200) > > ---------------------------------------------------------------- > Block layer patches for 2.4.0-rc2 > > ---------------------------------------------------------------- Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-20 16:00 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-20 14:54 [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Kevin Wolf 2015-07-20 14:54 ` [Qemu-devel] [PULL 1/1] crypto: Fix aes_decrypt_wrapper() Kevin Wolf 2015-07-20 16:00 ` [Qemu-devel] [PULL 0/1] Block layer patches for 2.4.0-rc2 Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).