Commit dcc8a3ab authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f73ca736 bd095946

crypto/cipher-nettle.c

+1 −1
Original line number Diff line number Diff line
@@ -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,