diff options
| author | Peter Maydell | 2015-12-23 14:53:32 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-12-23 14:53:32 +0100 |
| commit | 38a762fec63fd5c035aae29ba9a77d357e21e4a7 (patch) | |
| tree | 08b447dac347975d9a22215bdb57f80329b82354 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | crypto: fix transposed arguments in cipher error message (diff) | |
| download | qemu-38a762fec63fd5c035aae29ba9a77d357e21e4a7.tar.gz qemu-38a762fec63fd5c035aae29ba9a77d357e21e4a7.tar.xz qemu-38a762fec63fd5c035aae29ba9a77d357e21e4a7.zip | |
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>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions