Commit Graph

4657 Commits

Author SHA1 Message Date
Bernhard Miklautz
33d9497253
Merge pull request #5992 from alexpilotti/fix_build
Fix stable-1.1 build on Windows
2020-03-27 00:41:29 +01:00
Alessandro Pilotti
3850ba376c Add missing wincred.h include on Windows 2020-03-25 05:09:29 +02:00
Alessandro Pilotti
7ff58e992a Fix GetSecurityStatusString on Windows 2020-03-25 05:08:02 +02:00
Bernhard Miklautz
6b66f199e6 fix: add missing file 2019-05-17 09:48:21 +02:00
akallabeth
590fa7dbf6
Merge pull request #5391 from bmiklautz/stable-1.1-backports
Backport multiple fixes from master
2019-05-09 12:57:10 +02:00
Bernhard Miklautz
a99ec8cb65 new: support for protocol version 6
Based on 8df96364f2

Backported by:
	Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
	Bernhard Miklautz <bernhard.miklautz@thincast.com>
	Martin Fleisz <martin.fleisz@thincast.com>
2019-05-09 12:03:06 +02:00
Bernhard Miklautz
6fa64006a1 fix: CVE-2018-8789
Backport of 2ee663f39d
2019-05-09 11:30:56 +02:00
Bernhard Miklautz
af9a8fbf31 fix: CVE-2018-8788
Backport of d1112c279b
2019-05-09 11:29:57 +02:00
Bernhard Miklautz
f777230e15 fix: CVE-2018-8787
Backport of 09b9d4f199
2019-05-09 11:28:29 +02:00
Bernhard Miklautz
4f2a7bd7d4
Merge pull request #5390 from abagarwams/portCVE2018-8786
Porting patch for CVE2018-8786 to 1.1 branch
2019-05-09 11:10:02 +02:00
abagarewa
9f96ce255e Porting patch for CVE2018-8786 to 1.1 branch 2019-05-08 16:33:33 -07:00
Bernhard Miklautz
851f0979d5
Merge pull request #4427 from ondrejholy/tls1+-stable-1.1
tls: enable tls 1+ for stable-1.1
2018-02-13 16:06:24 +01:00
Bernhard Miklautz
1c1d825b2f tls: enable tls 1+
Currently TLS version 1.0 is used implicitly by using the TLSv1_method.
To be able to also use TLS 1.1 and later use SSLv23_client_method
instead. To make sure SSLv2 or SSLv3 isn't used disable them.

Commit aa80f63b from master was backported by Ondrej Holy <oholy@redhat.com>.

https://github.com/FreeRDP/FreeRDP/issues/2128
2018-02-13 15:54:15 +01:00
Bernhard Miklautz
03ab683189 Fix multiple security issues
Fix the following issues identified by the CISCO TALOS project:

* TALOS-2017-0336 CVE-2017-2834
* TALOS-2017-0337 CVE-2017-2835
* TALOS-2017-0338 CVE-2017-2836
* TALOS-2017-0339 CVE-2017-2837
* TALOS-2017-0340 CVE-2017-2838
* TALOS-2017-0341 CVE-2017-2839

Backported based on commit 8292b4558f.
2017-07-27 14:04:21 +02:00
Bernhard Miklautz
4c69c3ea14 Merge pull request #2818 from vancepym/stable-1.1
Error: "Unable to detect time zone" - Add support for tz package
2016-02-23 16:22:16 +01:00
Scott Fan
605d0a8518 Add support for tz package
Fixes error message while freerdp connected the remote desktop:
Unable to detect time zone
2015-07-13 15:18:52 +08:00
Marc-André Moreau
770c67d340 Merge pull request #2453 from bmiklautz/stable-1.1_cmd_fixes
settings: handle collection_add in detection case
2015-03-12 07:31:38 -04:00
Bernhard Miklautz
85856224f6 settings: handle collection_add in detection case
Command line detection is run with dummy settings where not everything
is allocated. Collections (device, dynamic channel and static
channel) didn't handle this case properly.

(cherry picked from commit e9985c2093)

Conflicts:
	client/common/test/TestClientCmdLine.c
2015-03-10 14:30:51 +01:00
Bernhard Miklautz
a700ee75f9 Merge pull request #2440 from bmiklautz/stable1.1/issue_2439
core/glyph: copy data when adding glyph to cache
2015-03-05 16:42:52 +01:00
Bernhard Miklautz
daea54925b core/glyph: copy data when adding glyph to cache
fixes #2439

(cherry picked from commit c99d9ee72b)
2015-03-05 15:10:48 +01:00
Norbert Federa
b21ff842ef Merge pull request #2380 from bmiklautz/stable-1.1_cmdline
Build and command line fixes
2015-02-12 11:09:30 +01:00
Bernhard Miklautz
f42b03f7bb build: fix build on win32
Manually pick changes and improvements from master to build on win32
(without specifying platform toolset)
2015-02-11 17:51:30 +01:00
Bernhard Miklautz
3cd91cf599 build: updates to build with pull request builder 2015-02-11 11:41:16 +01:00
Bernhard Miklautz
ab59334c66 build: fix TestClientCmdLine MONOLITHIC_BUILD 2015-02-11 10:47:57 +01:00
Bernhard Miklautz
892431326f ci: add config-linux-all.txt 2015-02-11 02:05:32 +01:00
Bernhard Miklautz
a5f6ba04cd client: fixed line compatibility 2015-02-11 01:58:16 +01:00
Bernhard Miklautz
eb9112c84b client/common: add test for client command line 2015-02-11 01:57:31 +01:00
Armin Novak
ae025ae332 Fixed memory leak.
(cherry picked from commit 9863ccfe66)
2015-01-16 14:07:38 +01:00
Armin Novak
2228cd6e73 Fixed multiple parsing errors for compatibility command line.
(cherry picked from commit dfb6176df6)

Conflicts:
	client/common/compatibility.c
2015-01-16 14:07:31 +01:00
Armin Novak
1fdf05da3f Fixed windows command line
freerdp_detect_windows_style_command_line_syntax returns negative values
in error but also in help and version case... oh boy

(cherry picked from commit f86ed3ffef)
2015-01-16 13:56:35 +01:00
Armin Novak
41313e6d70 Fixed missing NULL pointer check.
(cherry picked from commit 241848038c)

Conflicts:
	client/common/compatibility.c
2015-01-16 13:56:23 +01:00
Armin Novak
dab7113f0f Fixed clang warnings.
Fixed check for compatibility command line.

(cherry picked from commit 20f7e4d301)

Conflicts:
	client/common/cmdline.c
2015-01-16 13:54:16 +01:00
Armin Novak
cd21ac3498 Fixed command line pre filter, now returning 2 to skip argument.
(cherry picked from commit 1d4403cbbe)

Conflicts:
	client/common/compatibility.c
2015-01-16 13:53:00 +01:00
Bernhard Miklautz
7974c5072c winpr build: cmake 3.1 compatibility
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single
* / instead of // as previously - necessary adoptions for regex and
  matches done. Should work with all cmake versions.
2015-01-16 13:43:04 +01:00
Bernhard Miklautz
0027350ff0 build: improve X11 detection on OS X
/usr/X11R6 doesn't exist on OS X per default (anymore). Therefore add
PATHS to all X11 detection modules pointing to the Xquarz installation
directory in /opt/X11.
For FindX11 it was also necessary to ensure that the frameworks are
searched as last (after PATHS) otherwise it could happen that X11 headers
of a framework (e.g. Tk.framework) were used.

(cherry picked from commit b35dc849ee)
2015-01-16 13:27:31 +01:00
Bernhard Miklautz
598d30f8b8 Mac: set policy to silent cmake >= 3.0 warnings
Set the following policies to "OLD" if cmake version is greater than
2.8.12:

CMP0026 - Disallow use of the LOCATION target property
CMP0045 - Error on non-existent target in get_target_property

(cherry picked from commit 10ee2f72d9)
2015-01-16 13:27:22 +01:00
Bernhard Miklautz
b065492890 build: cmake 3.1 compatibility
* fix problem with REMOVE_DUPLICATES on undefined lists
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
  previously - necessary adoptions for regex and matches done. Should
	work with all cmake versions.

Tested with 3.1.0-rc3

(cherry picked from commit 1b663ceffe)

Conflicts:
	client/CMakeLists.txt
	server/CMakeLists.txt
2015-01-16 13:27:08 +01:00
Bernhard Miklautz
6c6fb62029 mfreerdp: fix build with latest cmake
Newer versions of cmake seem to use CMAKE_C_FLAGS for objective-c.
Now both flags are set for compatibility.

(cherry picked from commit 9ab95adf0d)
2015-01-16 13:24:52 +01:00
Marc-André Moreau
440916eae2 Merge pull request #2061 from bmiklautz/remove_winpr_configh
Get rid of winpr/config.h
2014-08-25 09:52:43 -04:00
Bernhard Miklautz
6d2d377ed1 Get rid of winpr/config.h
winpr/config.h just contains WITH_NATIVE_SSPI which is already
defined in top level config.h.
2014-08-24 14:31:13 +02:00
Marc-André Moreau
6fc97c7179 Merge pull request #2040 from dpoe/stable-1.1
handle user@corp.net username correctly
2014-08-18 13:07:30 -04:00
Daryl Poe
248c918508 handle user@corp.net username correctly 2014-08-15 15:45:06 -06:00
Bernhard Miklautz
b07a5c11e4 Merge pull request #2031 from bmiklautz/fix/stable-1.1/ffmpeg2
build: fix tsmf ffmpeg build
2014-08-09 21:06:40 +02:00
Bernhard Miklautz
dc7f6abbed build: fix tsmf ffmpeg build
Backported fixes to build against libavcodec >= 9.0
2014-08-08 16:05:45 +02:00
Bernhard Miklautz
7b5cd86a3e Merge pull request #2030 from bmiklautz/fix/stable-1.1/ffmpeg
build: fix tsmf ffmpeg
2014-08-08 15:22:12 +02:00
Ian Whyman
75b6e12c11 Backwards compat defines
Conflicts:
	channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
2014-08-08 15:13:25 +02:00
Ian Whyman
3b9b030b0e CODEC_ID_* -> AV_CODEC_ID_* 2014-08-08 15:08:15 +02:00
Bernhard Miklautz
28f65ff297 Merge pull request #1887 from dpoe/stable-1.1
correct Pause key sequence
2014-07-25 11:23:09 +02:00
Hardening
3122946757 Merge pull request #1891 from hardening/CVE-2014-0250_1dot1
Fix for CVE 2014-0250
2014-06-19 10:24:10 +02:00
Hardening
5ad707ddf3 Fix CVE-2014-0250
This patch fixes CVE-2014-0250 by checking width, height and bpp when
receiving a new pointer.
2014-06-06 23:24:16 +02:00