File rdesktop-Fix-decryption.patch of Package rdesktop

Overview Repositories Revisions Requests Users Attributes Meta

File rdesktop-Fix-decryption.patch of Package rdesktop

From: Markus Beth <markus.beth@web.de>
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)

Places

File rdesktop-Fix-decryption.patch of Package rdesktop

Places