projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9c27e7 fff2f98)
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-03-30-1' into...
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 30 Mar 2016 14:04:08 +0000 (15:04 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 30 Mar 2016 14:04:08 +0000 (15:04 +0100)
commit69bc7f5029db5ea55359f7905e9829777ae5a34f
treea8241235364fce3e0ebff1ef7265e7d3e8cbf80etree | snapshot
parentb9c27e7ae6fb1387eafe858d8378ff14cd1c5b89commit | diff
parentfff2f982ab6ac0dd2b641d30303f72270a019f28commit | diff
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>
Domain: SDK / Emulator;