From: Peter Maydell Date: Fri, 18 Dec 2015 17:04:15 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-secrets-base-2015... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c688084506cf2cf2eba4ba9df4e91abb6e3dab83;p=qemu.git Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-secrets-base-2015-12-18-1' into staging 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 " # gpg: aka "Daniel P. Berrange " * 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 --- c688084506cf2cf2eba4ba9df4e91abb6e3dab83