The following changes since commit e66b05e9ca471715388182613217503160ed7a4d:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-07-20 21:32:56 +0100) are available in the git repository at: git://github.com/berrange/qemu tags/pull-qcrypto-2016-07-21-1 for you to fetch changes up to 760328971218bace4ab14b01f619825607fab9c3: crypto: don't open-code qcrypto_hash_supports (2016-07-21 10:46:27 +0100) ---------------------------------------------------------------- Merge qcrypto-next 2016/07/21 v1 ---------------------------------------------------------------- Daniel P. Berrange (3): crypto: use /dev/[u]random as a final fallback random source crypto: use glib as fallback for hash algorithm crypto: don't open-code qcrypto_hash_supports crypto/Makefile.objs | 4 +- crypto/hash-gcrypt.c | 3 +- crypto/hash-glib.c | 97 +++++++++++++++++++++++++++++ crypto/hash-nettle.c | 3 +- crypto/hash-stub.c | 41 ------------ crypto/{random-stub.c => random-platform.c} | 37 ++++++++++- 6 files changed, 136 insertions(+), 49 deletions(-) create mode 100644 crypto/hash-glib.c delete mode 100644 crypto/hash-stub.c rename crypto/{random-stub.c => random-platform.c} (52%) -- 2.7.4