3e305e4a47
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>
47 lines
1.4 KiB
Makefile
47 lines
1.4 KiB
Makefile
vnc-obj-y += vnc.o
|
|
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
|
|
vnc-obj-y += vnc-auth-vencrypt.o
|
|
vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.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
|
|
common-obj-y += input.o input-keymap.o input-legacy.o
|
|
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
|
|
common-obj-$(CONFIG_SDL) += sdl.mo x_keymap.o
|
|
common-obj-$(CONFIG_COCOA) += cocoa.o
|
|
common-obj-$(CONFIG_CURSES) += curses.o
|
|
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
|
|
common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
|
|
|
|
ifeq ($(CONFIG_SDLABI),1.2)
|
|
sdl.mo-objs := sdl.o sdl_zoom.o
|
|
endif
|
|
ifeq ($(CONFIG_SDLABI),2.0)
|
|
sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o
|
|
ifeq ($(CONFIG_OPENGL),y)
|
|
sdl.mo-objs += sdl2-gl.o
|
|
endif
|
|
endif
|
|
sdl.mo-cflags := $(SDL_CFLAGS)
|
|
|
|
ifeq ($(CONFIG_OPENGL),y)
|
|
common-obj-y += shader.o
|
|
common-obj-y += console-gl.o
|
|
common-obj-y += egl-helpers.o
|
|
common-obj-$(CONFIG_GTK) += gtk-egl.o
|
|
endif
|
|
|
|
gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
|
|
gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS)
|
|
shader.o-cflags += $(OPENGL_CFLAGS)
|
|
console-gl.o-cflags += $(OPENGL_CFLAGS)
|
|
egl-helpers.o-cflags += $(OPENGL_CFLAGS)
|
|
|
|
gtk-egl.o-libs += $(OPENGL_LIBS)
|
|
shader.o-libs += $(OPENGL_LIBS)
|
|
console-gl.o-libs += $(OPENGL_LIBS)
|
|
egl-helpers.o-libs += $(OPENGL_LIBS)
|