Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-secrets-base-2015...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 17:04:15 +0000 (17:04 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 17:04:15 +0000 (17:04 +0000)
Merge QCryptoSecret object support

# gpg: Signature made Fri 18 Dec 2015 16:51:21 GMT 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-secrets-base-2015-12-18-1:
  crypto: add support for loading encrypted x509 keys
  crypto: add QCryptoSecret object class for password/key handling
  qga: convert to use error checked base64 decode
  qemu-char: convert to use error checked base64 decode
  util: add base64 decoding function

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge