Hello community,
here is the log from the commit of package rdesktop for openSUSE:Factory checked in at 2019-06-19 21:14:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rdesktop (Old)
and /work/SRC/openSUSE:Factory/.rdesktop.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdesktop"
Wed Jun 19 21:14:01 2019 rev:39 rq:710860 version:1.8.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/rdesktop/rdesktop.changes 2019-06-01 09:51:31.379282843 +0200
+++ /work/SRC/openSUSE:Factory/.rdesktop.new.4811/rdesktop.changes 2019-06-19 21:14:36.010874740 +0200
@@ -1,0 +2,7 @@
+Wed Jun 12 20:07:09 UTC 2019 - Markus Beth
+
+- Added rdesktop-Fix-decryption.patch
+ Patch from https://github.com/rdesktop/rdesktop/pull/334 to fix
+ connections to VirtualBox.
+
+-------------------------------------------------------------------
New:
----
rdesktop-Fix-decryption.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rdesktop.spec ++++++
--- /var/tmp/diff_new_pack.f7GYHd/_old 2019-06-19 21:14:36.906875653 +0200
+++ /var/tmp/diff_new_pack.f7GYHd/_new 2019-06-19 21:14:36.910875657 +0200
@@ -29,6 +29,8 @@
# PATCH-FIX-OPENSUSE rdesktop-Fix-keymap-script.patch
Patch3: rdesktop-Fix-keymap-script.patch
Patch4: rdesktop-Fix-key-caching.patch
+# PATH-FIX-UPSTREAM rdesktop-Fix-decryption.patch
+Patch5: rdesktop-Fix-decryption.patch
BuildRequires: alsa-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -57,6 +59,7 @@
%patch4 -p1
%endif
%patch3 -p1
+%patch5 -p1
## rpmlint
# incorrect-fsf-address /usr/share/rdesktop/keymaps/convert-map
++++++ rdesktop-Fix-decryption.patch ++++++
From: Markus Beth
Date: 2019-06-11 22:57:31 +0200
Subject: [PATCH] sec_decrypt() the correct amount of data
Upstream: submitted
see https://github.com/rdesktop/rdesktop/pull/334
Index: rdesktop-1.8.6/secure.c
===================================================================
--- rdesktop-1.8.6.orig/secure.c
+++ rdesktop-1.8.6/secure.c
@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
STREAM s;
struct stream packet;
size_t data_offset;
+ size_t remaining;
unsigned char *data;
while ((s = mcs_recv(&channel, rdpver)) != NULL)
@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
data_offset = s_tell(s);
- inout_uint8p(s, data, s_remaining(s));
- sec_decrypt(data, s_remaining(s));
+ remaining = s_remaining(s);
+ inout_uint8p(s, data, remaining);
+ sec_decrypt(data, remaining);
s_seek(s, data_offset);
}
@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
data_offset = s_tell(s);
- inout_uint8p(s, data, s_remaining(s));
- sec_decrypt(data, s_remaining(s));
+ remaining = s_remaining(s);
+ inout_uint8p(s, data, remaining);
+ sec_decrypt(data, remaining);
}
if (sec_flags & SEC_LICENCE_NEG)
@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
data_offset = s_tell(s);
- inout_uint8p(s, data, s_remaining(s));
- sec_decrypt(data, s_remaining(s));
+ remaining = s_remaining(s);
+ inout_uint8p(s, data, remaining);
+ sec_decrypt(data, remaining);
/* Check for a redirect packet, starts with 00 04 */
if (data[0] == 0 && data[1] == 4)
