The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a:
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000) are available in the git repository at: git://github.com/berrange/qemu tags/pull-crypto-2016-03-21-1 for you to fetch changes up to f7ac78cfe1bdb1f0067eac66edd2ae550080f061: crypto: fix cipher function signature mismatch with nettle & xts (2016-03-21 10:03:45 +0000) ---------------------------------------------------------------- Merge crypto 2016/03/21 v1 ---------------------------------------------------------------- Daniel P. Berrange (2): crypto: add compat cast5_set_key with nettle < 3.0.0 crypto: fix cipher function signature mismatch with nettle & xts crypto/cipher-nettle.c | 146 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 111 insertions(+), 35 deletions(-) -- 2.5.0