xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 19:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Block layer patches for 2.4.0-rc2

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJVrQpYAAoJEH8JsnLIjy/WWWQQALQhq104YfaesafxHvr9XGsp
 LxQXyPue5vCapaUIVxCdopfxEV1mZnWnNoWt++d8dgITBq36hhtvBJEjs52awvP1
 uoNv3l4s2QsoAvJDBYHS1KpUs/oz410sJltqAa2rl9sy+uEVp6PtP7/ueWQdBfqg
 NjF9meK1MwR1W+iODmTagFc5iYqtiar2rcgOw9UxNokegvefJDiKbM4VSY18sn8o
 2yCagM2iWFODaf5U/BE7BVqEduCcfUR+nbM3qFRawm8ZxaTMb8+NeNHugL/xPabF
 ji8bMHgf2AjaxtYua0GQ4XDmKhZ5pm298wiLwO9fLW3Am01y9yuf+CpIJ7bCknpZ
 sH0YA1kF1ISffnL92zx3VZ0bvSDqIds39cBzCotuiWys/4UHSTksOC0Am8HUEBch
 D8nDnvkCPTObIf0tn9Ylepp6FnedTOH3qkE4Z+OijBWWirxcconru13H/mmazhRf
 t2kTP5zPStOC8mkMZwhB7Xycly4SmgQkHutn6JO29jnljlALDnEdbSxqYw2ujHDo
 ThySL9SKUBEu+KQYmUwwJQ/gfC56tkcyMBDnNFV5RtWssIualZuwx+My3YF0caJ7
 S1eNrMeng+imZimqR51vvbc+hHja17kfGz/jlWnOZgTvrV5fg9eCObrwOfTyOe/R
 GuFhgelfhXMoXNW5e+VI
 =cYpR
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2015-07-20 16:01:31 +01:00
commit dcc8a3ab63
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/cipher-nettle.c
View File

@ -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,