summaryrefslogtreecommitdiff
path: root/ui/Makefile.objs
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-07-01 18:10:36 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-07-08 13:11:01 +0200
commit8e9b0d24fb986d4241ae3b77752eca5dab4cb486 (patch)
treece366ef15d1da340c5219bfd7814fa0b4a102d87 /ui/Makefile.objs
parent488981a4af396551a3178d032cc2b41d9553ada2 (diff)
ui: convert VNC websockets to use crypto APIs
Remove the direct use of gnutls for hash processing in the websockets code, in favour of using the crypto APIs. This allows the websockets code to be built unconditionally removing countless conditional checks from the VNC code. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1435770638-25715-9-git-send-email-berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui/Makefile.objs')
-rw-r--r--ui/Makefile.objs2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index dd1f8e42ca..c62d4d9722 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -4,7 +4,7 @@ vnc-obj-y += vnc-enc-tight.o vnc-palette.o
vnc-obj-y += vnc-enc-zrle.o
vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
-vnc-obj-$(CONFIG_VNC_WS) += vnc-ws.o
+vnc-obj-y += vnc-ws.o
vnc-obj-y += vnc-jobs.o
common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o