diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d13b869..aa2e3027 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2023-09-28-remove_logind' + FDO_DISTRIBUTION_TAG: '2023-10-05-neatvnc-0.7.0' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index d5f25797..565f3e54 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -181,7 +181,7 @@ meson build --wrap-mode=nofallback ninja ${NINJAFLAGS} -C build install cd .. rm -rf aml -git clone --branch v0.6.0 --depth=1 https://github.com/any1/neatvnc.git +git clone --branch v0.7.0 --depth=1 https://github.com/any1/neatvnc.git cd neatvnc meson build --wrap-mode=nofallback -Dauto_features=disabled ninja ${NINJAFLAGS} -C build install diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build index a5706356..b7b69165 100644 --- a/libweston/backend-vnc/meson.build +++ b/libweston/backend-vnc/meson.build @@ -3,7 +3,7 @@ if not get_option('backend-vnc') endif config_h.set('BUILD_VNC_COMPOSITOR', '1') -dep_neatvnc = dependency('neatvnc', version: ['>= 0.6.0', '< 0.7.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) +dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) if not dep_neatvnc.found() error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') endif diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c index 8865eb82..2d5de0c0 100644 --- a/libweston/backend-vnc/vnc.c +++ b/libweston/backend-vnc/vnc.c @@ -1248,8 +1248,15 @@ vnc_backend_create(struct weston_compositor *compositor, goto err_output; } - ret = nvnc_enable_auth(backend->server, config->server_key, - config->server_cert, vnc_handle_auth, + ret = nvnc_set_tls_creds(backend->server, config->server_key, + config->server_cert); + if (ret) { + weston_log("Failed set TLS credentials\n"); + goto err_output; + } + + ret = nvnc_enable_auth(backend->server, NVNC_AUTH_REQUIRE_AUTH | + NVNC_AUTH_REQUIRE_ENCRYPTION, vnc_handle_auth, NULL); if (ret) { weston_log("Failed to enable TLS support\n");