Commit Graph

9576 Commits

Author SHA1 Message Date
Bernhard Miklautz
738f55a6a8 Merge pull request #3119 from akallabeth/abort_event_reset
Resetting abortEvent only on connect and reconnect.
2016-02-23 17:14:08 +01:00
akallabeth
a53e4f47fd Merge pull request #3015 from bmiklautz/pull/2936
tcp: change TCP_USER_TIMEOUT to 16000
2016-02-23 16:46:16 +01:00
Armin Novak
d28cb6ac6a Removed function call with invalid arguments. 2016-02-23 16:32:47 +01:00
Armin Novak
24c93e4de7 Resetting abortEvent only on connect and reconnect. 2016-02-23 16:32:47 +01:00
Bernhard Miklautz
be02849ece tcp: set the timeout to 9s
Set the TCP_USER_TIMEOUT to 9s as suggested by @giox069.
See #3015 for details
2016-02-23 15:40:20 +01:00
volth
8b9c40248a Increase TCP_USER_TIMEOUT to avoid disconnections.
TCP_USER_TIMEOUT value is too small, it is only 4 seconds. 
That causes random disconnections reported in the bug report https://github.com/FreeRDP/FreeRDP/issues/2802
This patch should fix the bug report https://github.com/FreeRDP/FreeRDP/issues/2802
2016-02-23 15:40:20 +01:00
Bernhard Miklautz
35faa8b221 Merge pull request #3148 from mfleisz/win32_include_fix
winpr/file: Add missing include (io.h) for windows builds
2016-02-23 11:44:58 +01:00
akallabeth
05aa425cae Merge pull request #2851 from ilammy/x11-cliprdr/improve-format-support
Improve clipboard format support in X11 client
2016-02-23 09:56:17 +01:00
Martin Fleisz
1b881e47d3 winpr/file: Add missing include (io.h) for windows builds 2016-02-23 09:55:55 +01:00
akallabeth
88fa29c500 Merge pull request #3145 from giox069/master
Fix char signedness in glyph offset calculation, fixes #2137
2016-02-23 09:37:31 +01:00
ilammy
93fc349ce6 client/X11: harden xf_cliprdr_parse_server_format_list()
* Make sure that numFormats has reasonable value

This will help catching errors like writing -1 as an unsigned number
of formats into the serialized stream, or trying to read the property
after someone else erroneosly messed with it, or other similar mistakes
which would result into reading and then sending garbage to the server.

We read the list xf_cliprdr_get_raw_server_formats() from an X window
property. Properties generally cannot be larger than 4 KB and each
format requires at least 5 bytes (most of them are named, though),
which gives us 512-ish limit on the number of formats we can squeeze
into the property.

However, it's hard to find an application that provides more than
20 formats (I've seen like 15 for MS Office apps), thus I believe
we can safely assume than anything that does not fit into a byte
means that we are reading garbage rather than a good format list.

* Check for the end of stream when reading format names

This also prevents reading garbage and getting segmentation faults
and Valgrind warnings when somebody somewhere sometimes forgets to
put a terminating null character where it belongs.

strnlen() and strndup() functions are provided by POSIX.1-2008
which we can reasonably expect to be available in 2016.
2016-02-23 01:20:34 +02:00
akallabeth
4d85ade558 Merge pull request #3136 from bmiklautz/winpr_version
winpr: BUMP the API version to 1.2
2016-02-22 13:54:08 +01:00
Bernhard Miklautz
8ac4998bdd Merge pull request #3147 from akallabeth/win_debug_symbol_fix
Installing debug symbols only if activated.
2016-02-22 12:48:42 +01:00
Armin Novak
6c8de27d8a Installing debug symbols only if activated. 2016-02-22 10:27:50 +01:00
Giovanni Panozzo
1dea98026a Fix char signedness in glyph offset calculation, fixes #2137 2016-02-21 18:15:32 +01:00
Bernhard Miklautz
503399f571 Merge pull request #3143 from akallabeth/deny_cert_if_cred_from_stdin
Abort certificate accept if password is read from stdin.
2016-02-19 13:27:13 +01:00
Armin Novak
ae4a1ee342 Abort certificate accept if password is read from stdin. 2016-02-19 10:25:21 +01:00
Bernhard Miklautz
12bd0ec823 winpr: BUMP the API version to 1.2
This is required that the exported cmake find module can be
differentiated from the "old" one. This allows it to have
multiple winpr API version installed in parallel.

find_package should now be used with an explicit version number
set like:

find_package(WinPR 1.2 REQUIRED)
2016-02-16 17:39:22 +01:00
Hardening
2a3e9996b3 Merge pull request #2710 from akallabeth/cert_temp_accept_v2
Extended certificate callbacks.
2016-02-15 13:52:47 +01:00
Hardening
0092bcf92c Merge pull request #3130 from pxx02134/patch-1
Update BookmarkDB.java
2016-02-14 14:18:26 +01:00
Hardening
f524c4c8a7 Merge pull request #3131 from pxx02134/patch-2
Update AndroidManifest.xml
2016-02-14 14:17:52 +01:00
Hardening
ef7c867f43 Merge pull request #3124 from nathankidd/region16_rects-handle-null
libfreerdp-codec: Make region16_rects() handle NULL nbRects
2016-02-12 21:19:13 +01:00
Nathan Kidd
d68e58a9dc libfreerdp-codec: Make region16_rects() handle NULL nbRects
Now matches header documentation.  Also cleans up related doc grammar.
2016-02-12 10:11:51 -05:00
Bernhard Miklautz
cf6ea23576 Merge pull request #3123 from nfedera/fix-keyboardtype-7
Several fixes for keyboard type 7 (japanese)
2016-02-12 10:43:25 +01:00
Hardening
cbd1ffa571 Merge pull request #3110 from akallabeth/mac_os_ssl_warning_fix
Mac os ssl warning fix
2016-02-11 22:21:33 +01:00
Norbert Federa
92aa21c45b Several fixes for keyboard type 7 (japanese) 2016-02-11 21:40:50 +01:00
pxx02134
2bf525d20b Update AndroidManifest.xml
ACCESS_NETWORK_STATE statement duplicated. It cause warnings while building.
2016-02-11 12:24:47 +09:00
pxx02134
2178245bac Update BookmarkDB.java
There seems to be two commas forgot.
2016-02-11 12:21:11 +09:00
Hardening
8bbbbf3955 Merge pull request #3116 from akallabeth/win_unicode_arg_fix
Reading unicode from command line.
2016-02-10 11:17:34 +01:00
Armin Novak
8be7b25a22 Printing help on invalid command line again. 2016-02-09 09:36:00 +01:00
Armin Novak
d67614a3e6 Reading unicode from command line. 2016-02-08 14:36:31 +01:00
Norbert Federa
bb3882bca4 Merge pull request #3111 from colemickens/hidpi-cli
Enable display scaling in client
2016-02-08 13:10:50 +01:00
Isaac Richter
1f6ba7963c Enable display scaling in client 2016-02-05 11:08:27 -08:00
Armin Novak
f4568295e9 Fixed API for old openssl versions < 1.0.0 2016-02-05 11:52:07 +01:00
Hardening
7534876209 Merge pull request #3113 from akallabeth/remove_broken_rdpdr_check
Removed broken check, fixes #3112
2016-02-05 11:12:48 +01:00
Armin Novak
c430d5eeb5 Removed broken check, fixes #3112 2016-02-05 10:50:26 +01:00
Armin Novak
80d7d639f7 Updated android API. 2016-02-05 02:32:47 +01:00
Armin Novak
6b406bdcda Not building GetLine on android and ios. 2016-02-05 02:05:37 +01:00
Armin Novak
5e46a6e4be Replaced getline with custom GetLine. 2016-02-05 02:05:37 +01:00
Armin Novak
b35f6658b9 Moved common code from cli clients to client lib. 2016-02-05 02:05:37 +01:00
Armin Novak
0e2208e942 Fixed warning. 2016-02-05 02:04:57 +01:00
Armin Novak
cbf2892ccc Implemented temporary certificate accept.
Certificates can now be accepted temporarily.
The callbacks for certificate validation have been
modified to extend the information presented to the user.
2016-02-05 02:04:57 +01:00
Armin Novak
16699000c4 Fixed allocation issue with common_name. 2016-02-05 02:04:00 +01:00
Martin Fleisz
56a0c4c336 Merge pull request #3097 from akallabeth/android_api_upgrade_v4
Android api upgrade and restructuring
2016-02-04 16:20:59 +01:00
Armin Novak
8fdf59ae00 Removed android SDK dependency for native build. 2016-02-04 16:09:49 +01:00
Bernhard Miklautz
db77cff224 Merge pull request #3108 from akallabeth/log_leve_adjust
Log level adjustments
2016-02-04 15:05:07 +01:00
Armin Novak
1f81556ed3 Removed hardcoded debug mode. 2016-02-04 14:33:28 +01:00
Armin Novak
74f3ebf793 Fixed argument for freerdp source. 2016-02-04 13:56:33 +01:00
Norbert Federa
94565a0445 Merge pull request #3109 from nfedera/fix-x11-xdgh-types-collision
fix X11/Xdg.h typedef collision fix
2016-02-04 13:04:41 +01:00
Armin Novak
b6b0f57a88 Fixed compiler warning about cast. 2016-02-04 12:57:21 +01:00