| commit | 9fa570d57e44e065b663715400eafc60fe66e005 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 21 Mar 2016 10:19:12 +0000 (21 10:19 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 21 Mar 2016 10:19:12 +0000 (21 10:19 +0000) | ||
| tree | d3e3e990268ce212c5ec066cbc50d0387eb40935 | treesnapshot (tar.gz zip) |
| parent | 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a | commitdiff |
| parent | f7ac78cfe1bdb1f0067eac66edd2ae550080f061 | commitdiff |
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>
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>