aboutsummaryrefslogtreecommitdiff
path: root/ui/vnc.h
diff options
context:
space:
mode:
authorTim Hardeck <thardeck@suse.de>2013-04-23 16:33:01 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-03 12:04:57 -0500
commit0057a0d59006d00c294de0b012d9a290eb1a5c80 (patch)
tree5eb08a6086fe37394127fb6eb97b9141025061a6 /ui/vnc.h
parent8f3b664f6cc4153cc73941c941d54c4e499b7537 (diff)
TLS support for VNC Websockets
Added TLS support to the VNC QEMU Websockets implementation. VNC-TLS needs to be enabled for this feature to be used. The required certificates are specified as in case of VNC-TLS with the VNC parameter "x509=<path>". If the server certificate isn't signed by a rooth authority it needs to be manually imported in the browser because at least in case of Firefox and Chrome there is no user dialog, the connection just gets canceled. As a side note VEncrypt over Websocket doesn't work atm because TLS can't be stacked in the current implementation. (It also didn't work before) Nevertheless to my knowledge there is no HTML 5 VNC client which supports it and the Websocket connection can be encrypted with regular TLS now so it should be fine for most use cases. Signed-off-by: Tim Hardeck <thardeck@suse.de> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1366727581-5772-1-git-send-email-thardeck@suse.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/vnc.h')
-rw-r--r--ui/vnc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/vnc.h b/ui/vnc.h
index fea39adcc7..6e9921387f 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -276,9 +276,12 @@ struct VncState
VncStateSASL sasl;
#endif
#ifdef CONFIG_VNC_WS
+#ifdef CONFIG_VNC_TLS
+ VncStateTLS ws_tls;
+#endif /* CONFIG_VNC_TLS */
bool encode_ws;
bool websocket;
-#endif
+#endif /* CONFIG_VNC_WS */
QObject *info;