The following changes since commit 5dc42c186d63b7b338594fc071cf290805dcc5a5:
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2015-12-22 14:21:42 +0000) are available in the git repository at: git://github.com/berrange/qemu tags/pull-crypto-fixes-2015-12-23-1 for you to fetch changes up to 50de6261510301d586f0411b3fdb11e4cd4fdb52: crypto: fix transposed arguments in cipher error message (2015-12-23 11:02:20 +0000) ---------------------------------------------------------------- Merge misc crypto changes & fixes ---------------------------------------------------------------- Daniel P. Berrange (6): crypto: add additional query accessors for cipher instances crypto: add ability to query hash digest len crypto: move QCryptoHashAlgorithm enum definition into QAPI crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI crypto: ensure qapi/crypto.json is listed in qapi-modules crypto: fix transposed arguments in cipher error message Makefile | 3 ++- crypto/cipher.c | 54 +++++++++++++++++++++++++++++++++++++++++++--- crypto/hash.c | 17 ++++++++++++++- include/crypto/cipher.h | 54 +++++++++++++++++++++++++++++++++------------- include/crypto/hash.h | 20 ++++++++++------- qapi/crypto.json | 45 ++++++++++++++++++++++++++++++++++++++ tests/test-crypto-cipher.c | 10 +++++++++ tests/test-crypto-hash.c | 5 +++++ 8 files changed, 180 insertions(+), 28 deletions(-) -- 2.5.0