diff options
| author | Daniel P. Berrange | 2015-03-17 14:42:59 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2015-03-18 09:25:14 +0100 |
| commit | 7b45a00d05cc936d28e36b95932864e8cc095968 (patch) | |
| tree | c6830f2131bd06d8226b9cf6699ab27680f73de0 /ui/vnc-ws.c | |
| parent | ui: enforce TLS when using websockets server (diff) | |
| download | qemu-7b45a00d05cc936d28e36b95932864e8cc095968.tar.gz qemu-7b45a00d05cc936d28e36b95932864e8cc095968.tar.xz qemu-7b45a00d05cc936d28e36b95932864e8cc095968.zip | |
ui: remove separate gnutls_session for websockets server
The previous change to the auth scheme handling guarantees we
can never have nested TLS sessions in the VNC websockets server.
Thus we can remove the separate gnutls_session instance.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/vnc-ws.c')
| -rw-r--r-- | ui/vnc-ws.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 0fcce4e378..5f9fcc42db 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -26,12 +26,12 @@ static int vncws_start_tls_handshake(struct VncState *vs) { - int ret = gnutls_handshake(vs->ws_tls.session); + int ret = gnutls_handshake(vs->tls.session); if (ret < 0) { if (!gnutls_error_is_fatal(ret)) { VNC_DEBUG("Handshake interrupted (blocking)\n"); - if (!gnutls_record_get_direction(vs->ws_tls.session)) { + if (!gnutls_record_get_direction(vs->tls.session)) { qemu_set_fd_handler(vs->csock, vncws_tls_handshake_io, NULL, vs); } else { |