The following changes since commit c2a57aae9a1c3dd7de77daf5478df10379aeeebf:
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into
staging (2016-09-09 12:49:41 +0100)
are available in the git repository at:
git://github.com/berrange/qemu tags/pull-qcrypto-2016-09-12-1
for you to fetch changes up to 90d6f60d0727df084b62674bf2310ac74467a5a4:
crypto: report enum strings instead of values in errors (2016-09-12 12:00:52
+0100)
----------------------------------------------------------------
Merge qcrypto 2016/09/12 v1
----------------------------------------------------------------
Daniel P. Berrange (2):
crypto: ensure XTS is only used with ciphers with 16 byte blocks
crypto: report enum strings instead of values in errors
Gonglei (1):
crypto: fix building complaint
crypto/block.c | 6 ++++--
crypto/cipher-builtin.c | 9 ++++++---
crypto/cipher-gcrypt.c | 12 ++++++++++--
crypto/cipher-nettle.c | 26 +++++++++++++++-----------
crypto/init.c | 3 +--
crypto/tlscredsx509.c | 6 +++---
tests/crypto-tls-x509-helpers.h | 1 -
tests/test-crypto-cipher.c | 43
+++++++++++++++++++++++++++++++++++--------
8 files changed, 74 insertions(+), 32 deletions(-)
--
2.7.4
