diff options
| author | Peter Xu | 2018-03-05 07:43:24 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé | 2018-03-06 11:19:07 +0100 |
| commit | 1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58 (patch) | |
| tree | c3b4811e045492e3d058f11c88b07589a8f19bca /ui | |
| parent | qio: non-default context for async conn (diff) | |
| download | qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.tar.gz qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.tar.xz qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.zip | |
qio: non-default context for TLS handshake
A new parameter "context" is added to qio_channel_tls_handshake() is to
allow the TLS to be run on a non-default context. Still, no functional
change.
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/vnc-auth-vencrypt.c | 1 | ||||
| -rw-r--r-- | ui/vnc-ws.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index 7833631275..d99ea362c1 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -128,6 +128,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len qio_channel_tls_handshake(tls, vnc_tls_handshake_done, vs, + NULL, NULL); } return 0; diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 6ccad22cef..950f1cd2ac 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -81,6 +81,7 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED, qio_channel_tls_handshake(tls, vncws_tls_handshake_done, vs, + NULL, NULL); return TRUE; |