diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2015-03-02 19:01:05 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2015-12-18 15:02:11 +0000 |
| commit | 2cc452281e1746f9c02d3c66633ce9e5bc391cae (patch) | |
| tree | d19f09be771030e5730e821b0c1a2fb30af20016 /ui/vnc.h | |
| parent | 04d2529da27db512dcbd5e99d0e26d333f16efcc (diff) | |
| download | qemu-2cc452281e1746f9c02d3c66633ce9e5bc391cae.zip qemu-2cc452281e1746f9c02d3c66633ce9e5bc391cae.tar.gz qemu-2cc452281e1746f9c02d3c66633ce9e5bc391cae.tar.bz2 | |
ui: convert VNC server to use QIOChannelTLS
Switch VNC server over to using the QIOChannelTLS object for
the TLS session. This removes all remaining VNC specific code
for dealing with TLS handshakes.
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'ui/vnc.h')
| -rw-r--r-- | ui/vnc.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -36,6 +36,7 @@ #include "crypto/tlssession.h" #include "qemu/buffer.h" #include "io/channel-socket.h" +#include "io/channel-tls.h" #include <zlib.h> #include <stdbool.h> @@ -281,7 +282,7 @@ struct VncState int auth; int subauth; /* Used by VeNCrypt */ char challenge[VNC_AUTH_CHALLENGE_SIZE]; - QCryptoTLSSession *tls; + QCryptoTLSSession *tls; /* Borrowed pointer from channel, don't free */ #ifdef CONFIG_VNC_SASL VncStateSASL sasl; #endif @@ -511,8 +512,6 @@ gboolean vnc_client_io(QIOChannel *ioc, ssize_t vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen); ssize_t vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen); -ssize_t vnc_tls_pull(char *buf, size_t len, void *opaque); -ssize_t vnc_tls_push(const char *buf, size_t len, void *opaque); /* Protocol I/O functions */ void vnc_write(VncState *vs, const void *data, size_t len); |