The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-09-14 18:51:09 +0100) are available in the git repository at: git://github.com/berrange/qemu.git tags/vnc-crypto-v8-for-upstream for you to fetch changes up to 63909633894a7d613aa80a32a827581da9bf5ad5: ui: convert VNC server to use QCryptoTLSSession (2015-09-15 11:08:52 +0100) ---------------------------------------------------------------- Merge vnc-crypto-v8 ---------------------------------------------------------------- Daniel P. Berrange (11): qapi: allow override of default enum prefix naming tests: remove repetition in unit test object deps crypto: move crypto objects out of libqemuutil.la qom: allow QOM to be linked into tools binaries crypto: introduce new base module for TLS credentials crypto: introduce new module for TLS anonymous credentials crypto: introduce new module for TLS x509 credentials crypto: add sanity checking of TLS x509 credentials crypto: introduce new module for handling TLS sessions ui: fix return type for VNC I/O functions to be ssize_t ui: convert VNC server to use QCryptoTLSSession Makefile | 10 +- Makefile.objs | 10 +- Makefile.target | 4 + configure | 53 +- crypto/Makefile.objs | 14 +- crypto/tlscreds.c | 251 +++++++ crypto/tlscredsanon.c | 223 +++++++ crypto/tlscredspriv.h | 42 ++ crypto/tlscredsx509.c | 809 ++++++++++++++++++++++ crypto/tlssession.c | 574 ++++++++++++++++ docs/qapi-code-gen.txt | 8 + include/crypto/tlscreds.h | 68 ++ include/crypto/tlscredsanon.h | 112 ++++ include/crypto/tlscredsx509.h | 113 ++++ include/crypto/tlssession.h | 322 +++++++++ qapi-schema.json | 3 + qapi/crypto.json | 21 + qemu-options.hx | 75 ++- qom/Makefile.objs | 7 +- scripts/qapi-types.py | 16 +- scripts/qapi.py | 10 +- tests/.gitignore | 7 + tests/Makefile | 106 +-- tests/crypto-tls-x509-helpers.c | 485 ++++++++++++++ tests/crypto-tls-x509-helpers.h | 133 ++++ tests/pkix_asn1_tab.c | 1104 +++++++++++++++++++++++++++++++ tests/qapi-schema/enum-bad-prefix.err | 1 + tests/qapi-schema/enum-bad-prefix.exit | 1 + tests/qapi-schema/enum-bad-prefix.json | 2 + tests/qapi-schema/enum-bad-prefix.out | 0 tests/qapi-schema/qapi-schema-test.json | 5 + tests/qapi-schema/qapi-schema-test.out | 2 + tests/test-crypto-tlscredsx509.c | 731 ++++++++++++++++++++ tests/test-crypto-tlssession.c | 535 +++++++++++++++ trace-events | 18 + ui/Makefile.objs | 2 +- ui/vnc-auth-sasl.c | 36 +- ui/vnc-auth-vencrypt.c | 80 ++- ui/vnc-tls.c | 474 ------------- ui/vnc-tls.h | 69 -- ui/vnc-ws.c | 84 +-- ui/vnc-ws.h | 2 - ui/vnc.c | 362 ++++++---- ui/vnc.h | 21 +- 44 files changed, 6125 insertions(+), 880 deletions(-) create mode 100644 crypto/tlscreds.c create mode 100644 crypto/tlscredsanon.c create mode 100644 crypto/tlscredspriv.h create mode 100644 crypto/tlscredsx509.c create mode 100644 crypto/tlssession.c create mode 100644 include/crypto/tlscreds.h create mode 100644 include/crypto/tlscredsanon.h create mode 100644 include/crypto/tlscredsx509.h create mode 100644 include/crypto/tlssession.h create mode 100644 qapi/crypto.json create mode 100644 tests/crypto-tls-x509-helpers.c create mode 100644 tests/crypto-tls-x509-helpers.h create mode 100644 tests/pkix_asn1_tab.c create mode 100644 tests/qapi-schema/enum-bad-prefix.err create mode 100644 tests/qapi-schema/enum-bad-prefix.exit create mode 100644 tests/qapi-schema/enum-bad-prefix.json create mode 100644 tests/qapi-schema/enum-bad-prefix.out create mode 100644 tests/test-crypto-tlscredsx509.c create mode 100644 tests/test-crypto-tlssession.c delete mode 100644 ui/vnc-tls.c delete mode 100644 ui/vnc-tls.h -- 2.4.3