diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 15:04:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 15:04:08 +0100 |
| commit | 69bc7f5029db5ea55359f7905e9829777ae5a34f (patch) | |
| tree | a8241235364fce3e0ebff1ef7265e7d3e8cbf80e /spice-qemu-char.c | |
| parent | b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89 (diff) | |
| parent | fff2f982ab6ac0dd2b641d30303f72270a019f28 (diff) | |
| download | qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.tar.gz qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.tar.bz2 qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-03-30-1' into staging
Merge qcrypto fixes 2016/03/30 v1
# gpg: Signature made Wed 30 Mar 2016 14:59:19 BST 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-qcrypto-2016-03-30-1:
crypto: do an explicit check for nettle pbkdf functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'spice-qemu-char.c')
0 files changed, 0 insertions, 0 deletions