From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 21 Mar 2016 10:19:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-2016-03-21-1' into... 
X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9fa570d57e44e065b663715400eafc60fe66e005;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-2016-03-21-1' into staging

Merge crypto 2016/03/21 v1

# gpg: Signature made Mon 21 Mar 2016 10:05:51 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-crypto-2016-03-21-1:
  crypto: fix cipher function signature mismatch with nettle & xts
  crypto: add compat cast5_set_key with  nettle < 3.0.0

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9fa570d57e44e065b663715400eafc60fe66e005