Add missing function definition in TLS patch

This commit is contained in:
Jonas Ådahl 2023-07-05 16:16:17 +02:00
parent bb1bf212e8
commit 57715ab608

View File

@ -1,4 +1,4 @@
From f2978ab58bc13a1d4bc51f5c73c23a63f07f8881 Mon Sep 17 00:00:00 2001 From e2a39fbf7b1a90aee818790ad847c20f59351adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 14 Jun 2018 12:21:37 +0200 Date: Thu, 14 Jun 2018 12:21:37 +0200
Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support
@ -14,13 +14,14 @@ VNC connection.
src/grd-session-vnc.c | 120 ++++- src/grd-session-vnc.c | 120 ++++-
src/grd-session-vnc.h | 17 + src/grd-session-vnc.h | 17 +
src/grd-settings-user.c | 28 ++ src/grd-settings-user.c | 28 ++
src/grd-settings.c | 6 +
src/grd-settings.h | 4 + src/grd-settings.h | 4 +
src/grd-vnc-server.c | 47 ++ src/grd-vnc-server.c | 47 ++
src/grd-vnc-tls.c | 444 ++++++++++++++++++ src/grd-vnc-tls.c | 444 ++++++++++++++++++
src/grd-vnc-tls.h | 28 ++ src/grd-vnc-tls.h | 28 ++
src/meson.build | 3 + src/meson.build | 3 +
...nome.desktop.remote-desktop.gschema.xml.in | 10 + ...nome.desktop.remote-desktop.gschema.xml.in | 10 +
11 files changed, 682 insertions(+), 26 deletions(-) 12 files changed, 688 insertions(+), 26 deletions(-)
create mode 100644 src/grd-vnc-tls.c create mode 100644 src/grd-vnc-tls.c
create mode 100644 src/grd-vnc-tls.h create mode 100644 src/grd-vnc-tls.h
@ -357,6 +358,23 @@ index 42bf31dd..5f6a87dd 100644
+ NULL, NULL, NULL, + NULL, NULL, NULL,
+ G_TYPE_NONE, 0); + G_TYPE_NONE, 0);
} }
diff --git a/src/grd-settings.c b/src/grd-settings.c
index 1cd4bea5..cd1dda1f 100644
--- a/src/grd-settings.c
+++ b/src/grd-settings.c
@@ -230,6 +230,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
return GRD_SETTINGS_GET_CLASS (settings)->get_vnc_auth_method (settings);
}
+GrdVncEncryption
+grd_settings_get_vnc_encryption (GrdSettings *settings)
+{
+ return GRD_SETTINGS_GET_CLASS (settings)->get_vnc_encryption (settings);
+}
+
static void
grd_settings_finalize (GObject *object)
{
diff --git a/src/grd-settings.h b/src/grd-settings.h diff --git a/src/grd-settings.h b/src/grd-settings.h
index 9e36ff9d..51f0f1c3 100644 index 9e36ff9d..51f0f1c3 100644
--- a/src/grd-settings.h --- a/src/grd-settings.h
@ -986,7 +1004,7 @@ index 5b39a5de..c6dc2ab5 100644
2.40.0 2.40.0
From b8cfd8e5428ca5e90e7be3da2c1b71226413f11a Mon Sep 17 00:00:00 2001 From e0192db09adddb551e4dbfeb17c281fb5815d7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:02:09 +0100 Date: Wed, 27 Nov 2019 11:02:09 +0100
Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals
@ -1154,7 +1172,7 @@ index a82952ae..1fd3b778 100644
2.40.0 2.40.0
From e65f12d3b022891eb39d8ee0f0c88db3f5ae4526 Mon Sep 17 00:00:00 2001 From 9a36ce45052d05a0e0e4ab70beba704b321875a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:03:46 +0100 Date: Wed, 27 Nov 2019 11:03:46 +0100
Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper
@ -1227,7 +1245,7 @@ index ffc8d27a..a86d61d2 100644
2.40.0 2.40.0
From 0cbebce170fdc994c467b43082a41e56209142f0 Mon Sep 17 00:00:00 2001 From 685f376a6b331d91e2bb34e8484682974db149a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:05:13 +0100 Date: Wed, 27 Nov 2019 11:05:13 +0100
Subject: [PATCH 4/7] vnc/tls: Add some logging Subject: [PATCH 4/7] vnc/tls: Add some logging
@ -1304,7 +1322,7 @@ index ec4758e0..ac6c35f6 100644
2.40.0 2.40.0
From 547a51efd438d2b812d4d3b0d725ccd38547018a Mon Sep 17 00:00:00 2001 From eebd752d3df83d6ae2df79782dbb8b4a80083608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:07:40 +0100 Date: Wed, 27 Nov 2019 11:07:40 +0100
Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of
@ -1474,7 +1492,7 @@ index ac6c35f6..312b6b92 100644
2.40.0 2.40.0
From 339341e34b4ecb1ab897604d24f3bedf9c8b1e53 Mon Sep 17 00:00:00 2001 From 9f41a7aba0f24a3253a1483a290364e887345b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 16:48:00 +0100 Date: Wed, 27 Nov 2019 16:48:00 +0100
Subject: [PATCH 6/7] session-vnc: Set our own password handling function up Subject: [PATCH 6/7] session-vnc: Set our own password handling function up
@ -1529,7 +1547,7 @@ index 8366e661..baf7520c 100644
2.40.0 2.40.0
From 2902160953407cfe6934d6ebcff2f1ea3722bfc8 Mon Sep 17 00:00:00 2001 From ea9f0e491c6fd34cc6eda0104d017eba1a671023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 12 Oct 2020 17:34:30 +0200 Date: Mon, 12 Oct 2020 17:34:30 +0200
Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride