diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-20 16:01:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-20 16:01:31 +0100 |
| commit | dcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f (patch) | |
| tree | 664e5f872907b22bdfbd07f344a1d9d28c875a26 | |
| parent | f73ca7363440240b7ee5ee7f7ddb1c64751efb54 (diff) | |
| parent | bd09594603f1498e7623f0030988b62e2052f7da (diff) | |
| download | qemu-dcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f.tar.gz | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.4.0-rc2
# gpg: Signature made Mon Jul 20 15:48:56 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
crypto: Fix aes_decrypt_wrapper()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | crypto/cipher-nettle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c index a55a8e8bc5..b01cb1c857 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, |