diff options
| author | Peter Maydell | 2015-12-18 18:04:15 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-12-18 18:04:15 +0100 |
| commit | c688084506cf2cf2eba4ba9df4e91abb6e3dab83 (patch) | |
| tree | 6737ec5f5e2709cffae7cdd094ee09e671cf23b2 /util/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | crypto: add support for loading encrypted x509 keys (diff) | |
| download | qemu-c688084506cf2cf2eba4ba9df4e91abb6e3dab83.tar.gz qemu-c688084506cf2cf2eba4ba9df4e91abb6e3dab83.tar.xz qemu-c688084506cf2cf2eba4ba9df4e91abb6e3dab83.zip | |
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 <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>
Diffstat (limited to 'util/Makefile.objs')
| -rw-r--r-- | util/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/Makefile.objs b/util/Makefile.objs index 89dd80ef86..8620a80b45 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -30,3 +30,4 @@ util-obj-y += qemu-coroutine-sleep.o util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o util-obj-y += buffer.o util-obj-y += timed-average.o +util-obj-y += base64.o |