2015-07-02 01:10:31 +08:00
|
|
|
vnc-obj-y += vnc.o
|
2012-05-22 19:48:15 +08:00
|
|
|
vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
|
|
|
|
|
vnc-obj-y += vnc-enc-tight.o vnc-palette.o
|
|
|
|
|
vnc-obj-y += vnc-enc-zrle.o
|
ui: convert VNC server to use QCryptoTLSSession
Switch VNC server over to using the QCryptoTLSSession object
for the TLS session. This removes the direct use of gnutls
from the VNC server code. It also removes most knowledge
about TLS certificate handling from the VNC server code.
This has the nice effect that all the CONFIG_VNC_TLS
conditionals go away and the user gets an actual error
message when requesting TLS instead of it being silently
ignored.
With this change, the existing configuration options for
enabling TLS with -vnc are deprecated.
Old syntax for anon-DH credentials:
-vnc hostname:0,tls
New syntax:
-object tls-creds-anon,id=tls0,endpoint=server \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, no client certs:
-vnc hostname:0,tls,x509=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=no \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, requiring client certs:
-vnc hostname:0,tls,x509verify=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=yes \
-vnc hostname:0,tls-creds=tls0
This aligns VNC with the way TLS credentials are to be
configured in the future for chardev, nbd and migration
backends. It also has the benefit that the same TLS
credentials can be shared across multiple VNC server
instances, if desired.
If someone uses the deprecated syntax, it will internally
result in the creation of a 'tls-creds' object with an ID
based on the VNC server ID. This allows backwards compat
with the CLI syntax, while still deleting all the original
TLS code from the VNC server.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2015-08-06 21:39:32 +08:00
|
|
|
vnc-obj-y += vnc-auth-vencrypt.o
|
2012-05-22 19:48:15 +08:00
|
|
|
vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
|
2015-07-02 01:10:36 +08:00
|
|
|
vnc-obj-y += vnc-ws.o
|
2012-06-20 21:24:28 +08:00
|
|
|
vnc-obj-y += vnc-jobs.o
|
2012-05-22 19:48:15 +08:00
|
|
|
|
2014-03-11 19:15:39 +08:00
|
|
|
common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o
|
2019-01-22 17:28:07 +08:00
|
|
|
common-obj-y += input.o input-keymap.o input-legacy.o kbd-state.o
|
2019-09-06 16:38:12 +08:00
|
|
|
common-obj-y += input-barrier.o
|
2016-03-04 18:25:14 +08:00
|
|
|
common-obj-$(CONFIG_LINUX) += input-linux.o
|
2012-05-22 19:48:15 +08:00
|
|
|
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
|
|
|
|
|
common-obj-$(CONFIG_COCOA) += cocoa.o
|
|
|
|
|
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
|
2018-02-02 14:45:46 +08:00
|
|
|
common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
|
2018-03-01 18:05:42 +08:00
|
|
|
|
2018-03-01 18:05:47 +08:00
|
|
|
# ui-sdl module
|
|
|
|
|
common-obj-$(CONFIG_SDL) += sdl.mo
|
2014-11-11 18:09:26 +08:00
|
|
|
sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o
|
2014-11-11 23:54:45 +08:00
|
|
|
ifeq ($(CONFIG_OPENGL),y)
|
|
|
|
|
sdl.mo-objs += sdl2-gl.o
|
|
|
|
|
endif
|
2014-10-28 16:47:55 +08:00
|
|
|
sdl.mo-cflags := $(SDL_CFLAGS)
|
2017-09-07 16:29:11 +08:00
|
|
|
sdl.mo-libs := $(SDL_LIBS)
|
2012-09-17 14:35:53 +08:00
|
|
|
|
2018-03-01 18:05:44 +08:00
|
|
|
# ui-gtk module
|
|
|
|
|
common-obj-$(CONFIG_GTK) += gtk.mo
|
|
|
|
|
gtk.mo-objs := gtk.o
|
|
|
|
|
gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
|
|
|
|
|
gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
|
2018-03-06 17:09:47 +08:00
|
|
|
ifeq ($(CONFIG_OPENGL),y)
|
|
|
|
|
gtk.mo-objs += gtk-egl.o
|
|
|
|
|
gtk.mo-libs += $(OPENGL_LIBS)
|
|
|
|
|
ifeq ($(CONFIG_GTK_GL),y)
|
|
|
|
|
gtk.mo-objs += gtk-gl-area.o
|
|
|
|
|
endif
|
|
|
|
|
endif
|
2018-03-01 18:05:44 +08:00
|
|
|
|
2018-05-17 20:39:42 +08:00
|
|
|
ifeq ($(CONFIG_X11),y)
|
|
|
|
|
sdl.mo-objs += x_keymap.o
|
|
|
|
|
gtk.mo-objs += x_keymap.o
|
|
|
|
|
x_keymap.o-cflags := $(X11_CFLAGS)
|
|
|
|
|
x_keymap.o-libs := $(X11_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
2018-03-01 18:05:45 +08:00
|
|
|
common-obj-$(CONFIG_CURSES) += curses.mo
|
|
|
|
|
curses.mo-objs := curses.o
|
2019-03-11 21:51:26 +08:00
|
|
|
curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS)
|
|
|
|
|
curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS)
|
2018-03-01 18:05:45 +08:00
|
|
|
|
2019-08-27 22:02:40 +08:00
|
|
|
ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy)
|
|
|
|
|
common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo
|
|
|
|
|
endif
|
2019-02-21 19:07:03 +08:00
|
|
|
spice-app.mo-objs := spice-app.o
|
|
|
|
|
spice-app.mo-cflags := $(GIO_CFLAGS)
|
|
|
|
|
spice-app.mo-libs := $(GIO_LIBS)
|
|
|
|
|
|
2018-03-06 17:09:48 +08:00
|
|
|
common-obj-$(CONFIG_OPENGL) += shader.o
|
|
|
|
|
common-obj-$(CONFIG_OPENGL) += console-gl.o
|
|
|
|
|
common-obj-$(CONFIG_OPENGL) += egl-helpers.o
|
|
|
|
|
common-obj-$(CONFIG_OPENGL) += egl-context.o
|
2017-05-17 20:27:44 +08:00
|
|
|
common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
|
2015-04-24 13:48:45 +08:00
|
|
|
|
|
|
|
|
shader.o-libs += $(OPENGL_LIBS)
|
2015-01-09 18:40:23 +08:00
|
|
|
console-gl.o-libs += $(OPENGL_LIBS)
|
2015-01-06 22:40:00 +08:00
|
|
|
egl-helpers.o-libs += $(OPENGL_LIBS)
|
2018-03-06 17:09:48 +08:00
|
|
|
egl-context.o-libs += $(OPENGL_LIBS)
|
|
|
|
|
egl-headless.o-libs += $(OPENGL_LIBS)
|