diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-21 11:48:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-21 11:48:49 +0100 |
| commit | 7239247a2ba2fd1c269edda3b6fd816c5fd51baf (patch) | |
| tree | 49f4b26b7975d3d24c5ed6ffbe901b23c4913f49 /hw/9pfs/virtio-9p-device.c | |
| parent | 61ead113ae53a4dae63b5377ace1300cb8705682 (diff) | |
| parent | 760328971218bace4ab14b01f619825607fab9c3 (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-07-21-1' into staging
Merge qcrypto-next 2016/07/21 v1
# gpg: Signature made Thu 21 Jul 2016 11:07:36 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qcrypto-2016-07-21-1:
crypto: don't open-code qcrypto_hash_supports
crypto: use glib as fallback for hash algorithm
crypto: use /dev/[u]random as a final fallback random source
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/9pfs/virtio-9p-device.c')
0 files changed, 0 insertions, 0 deletions