From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 23 Dec 2015 13:53:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-fixes-2015-12-23... 
X-Git-Tag: v2.6.0-rc0~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38a762fec63fd5c035aae29ba9a77d357e21e4a7;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-fixes-2015-12-23-1' into staging

Merge misc crypto changes & fixes

# gpg: Signature made Wed 23 Dec 2015 11:11:54 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-fixes-2015-12-23-1:
  crypto: fix transposed arguments in cipher error message
  crypto: ensure qapi/crypto.json is listed in qapi-modules
  crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI
  crypto: move QCryptoHashAlgorithm enum definition into QAPI
  crypto: add ability to query hash digest len
  crypto: add additional query accessors for cipher instances

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

38a762fec63fd5c035aae29ba9a77d357e21e4a7