Mike McDonald [Tue, 3 Jun 2014 11:05:31 +0000 (07:05 -0400)]
Merged changes from awakecoding/master
Mike McDonald [Tue, 3 Jun 2014 10:58:49 +0000 (06:58 -0400)]
Revert "Modified SCardConnect/SCardDisconnect logic to prevent more than one card from being connected to a context. Trying to connect more than once to a context without doing a disconnect can cause a deadlock in the pcsclite daemon (pcscd)."
This reverts commit
ed8ea297e790fd0e26e1a04148a3e6de2ea46dca.
Marc-André Moreau [Tue, 3 Jun 2014 01:49:49 +0000 (21:49 -0400)]
libwinpr-smartcard: avoid using pcsc-lite's buggy transaction system
Marc-André Moreau [Mon, 2 Jun 2014 21:20:01 +0000 (17:20 -0400)]
channels/smartcard: experiment with multiple card contexts
Marc-André Moreau [Mon, 2 Jun 2014 16:08:19 +0000 (12:08 -0400)]
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
Mike McDonald [Mon, 2 Jun 2014 15:08:32 +0000 (11:08 -0400)]
Modified SCardConnect/SCardDisconnect logic to prevent more than one card from being connected to a context. Trying to connect more than once to a context without doing a disconnect can cause a deadlock in the pcsclite daemon (pcscd).
Marc-André Moreau [Mon, 2 Jun 2014 02:25:19 +0000 (22:25 -0400)]
libwinpr-winsock: fix non-monolithic build
Marc-André Moreau [Mon, 2 Jun 2014 01:52:33 +0000 (21:52 -0400)]
libwinpr-winsock: fix build on Windows
Marc-André Moreau [Mon, 2 Jun 2014 01:37:20 +0000 (21:37 -0400)]
libfreerdp-core: replace all OpenSSL built-in BIOs by new full duplex BIOs
Marc-André Moreau [Sun, 1 Jun 2014 19:04:28 +0000 (15:04 -0400)]
libwinpr-winsock: initial winsock implementation
Marc-André Moreau [Sun, 1 Jun 2014 15:20:13 +0000 (11:20 -0400)]
libfreerdp-core: remove ineffective full duplex locks
Marc-André Moreau [Sun, 1 Jun 2014 14:46:58 +0000 (10:46 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Sun, 1 Jun 2014 14:46:43 +0000 (10:46 -0400)]
libfreerdp-core: fail more gracefully when transport thread dies
Marc-André Moreau [Sat, 31 May 2014 14:10:19 +0000 (10:10 -0400)]
libwinpr-utils: add WLog support for Win32 debugger console output
Marc-André Moreau [Fri, 30 May 2014 19:29:06 +0000 (15:29 -0400)]
libfreerdp-core: fix build on Windows
Marc-André Moreau [Fri, 30 May 2014 19:06:07 +0000 (15:06 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
libfreerdp/core/transport.c
Marc-André Moreau [Fri, 30 May 2014 18:53:10 +0000 (14:53 -0400)]
libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe)
Marc-André Moreau [Fri, 30 May 2014 18:36:18 +0000 (14:36 -0400)]
libfreerdp-core: fix VerifyX509Certificate to make distinction between gateway and direct connection
Marc-André Moreau [Fri, 30 May 2014 18:03:20 +0000 (14:03 -0400)]
libfreerdp-core: add connection timeout, fix gateway bypass local
Vic Lee [Fri, 30 May 2014 17:08:00 +0000 (01:08 +0800)]
transport: add another null pointer check.
Marc-André Moreau [Fri, 30 May 2014 16:55:17 +0000 (12:55 -0400)]
libfreerdp-common: add freerdp_update_gateway_usage_method helper
Marc-André Moreau [Fri, 30 May 2014 16:31:26 +0000 (12:31 -0400)]
libfreerdp-core: add gateway-usage-method command line option, avoid resetting BIO flags we shouldn't reset
Vic Lee [Fri, 30 May 2014 15:34:04 +0000 (23:34 +0800)]
transport: add a null pointer check.
Vic Lee [Fri, 30 May 2014 15:00:15 +0000 (23:00 +0800)]
rdpsnd/server: fix incorrect use of channe handle.
Vic Lee [Fri, 30 May 2014 14:30:21 +0000 (22:30 +0800)]
tcp: add timeout to prevent buggy client from hanging.
Marc-André Moreau [Fri, 30 May 2014 02:28:13 +0000 (22:28 -0400)]
Merge pull request #1874 from hardening/CVE-2014-0250
Fixes for CVE-2014-0250
Marc-André Moreau [Fri, 30 May 2014 01:29:24 +0000 (21:29 -0400)]
libwinpr-timezone: fix build on Windows
Marc-André Moreau [Thu, 29 May 2014 23:27:11 +0000 (19:27 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Thu, 29 May 2014 19:45:48 +0000 (15:45 -0400)]
Merge github.com:mrthebunny/FreeRDP
Marc-André Moreau [Thu, 29 May 2014 19:42:32 +0000 (15:42 -0400)]
libwinpr-utils: add WLOG_PREFIX environment variable
Marc-André Moreau [Thu, 29 May 2014 19:23:15 +0000 (15:23 -0400)]
libwinpr-utils: add support for fine grained wlog filter
Marc-André Moreau [Thu, 29 May 2014 16:39:09 +0000 (12:39 -0400)]
libwinpr-sysinfo: implement GetSystemTime, GetLocalTime
Marc-André Moreau [Thu, 29 May 2014 15:58:53 +0000 (11:58 -0400)]
libwinpr-timezone: stub functions
Hardening [Thu, 29 May 2014 08:12:02 +0000 (10:12 +0200)]
Check that bpp has reasonable value
As bpp is often used for malloc computations, let's check that it has
a reasonable value.
Hardening [Thu, 29 May 2014 07:24:59 +0000 (09:24 +0200)]
Check for bpp > 0
Bpp == 0 just makes no sense
Benoît LeBlanc [Thu, 29 May 2014 01:33:30 +0000 (21:33 -0400)]
tls_prepare: suppressed a warning on Mac
Hardening [Wed, 28 May 2014 22:12:48 +0000 (00:12 +0200)]
Set checks to be strict and also check xorBpp field
This patch:
* renames bpp to xorBpp ;
* changes checks to strict ;
* adds checks on the xorBpp field
Hardening [Wed, 28 May 2014 21:07:00 +0000 (23:07 +0200)]
Fixes for CVE-2014-0250
This patch introduce misc checks when receiving pointer updates. We check
that the cursor are in the bounds defined by the spec. We also check that
the announced mask sizes are what they should be.
Marc-André Moreau [Wed, 28 May 2014 14:38:32 +0000 (10:38 -0400)]
libwinpr-utils: extend wlog prefix format
Marc-André Moreau [Mon, 26 May 2014 21:54:39 +0000 (17:54 -0400)]
libwinpr-smartcard: add logging for each calls in smartcard inspector
Marc-André Moreau [Mon, 26 May 2014 20:20:28 +0000 (16:20 -0400)]
Merge pull request #1866 from nfedera/fix-2014-05-26-01
winpr: fixed incorrect pipe reference count usage
Marc-André Moreau [Mon, 26 May 2014 19:57:37 +0000 (15:57 -0400)]
libwinpr-smartcard: start smartcard API inspector
Norbert Federa [Mon, 26 May 2014 19:24:34 +0000 (21:24 +0200)]
winpr: fixed incorrect pipe reference count usage
- refcount is only relevant for servermode
- refcount was used uninitialized in clientmode
- credit for fix goes to @bmiklautz
Bug was introduced by
5e09e37d42bd8896a687df830a95f5cb56e4d47c
Marc-André Moreau [Mon, 26 May 2014 18:46:42 +0000 (14:46 -0400)]
cmake: add option to override default library type for complex submodules
Marc-André Moreau [Mon, 26 May 2014 17:01:40 +0000 (13:01 -0400)]
Merge pull request #1865 from awakecoding/master
Compression Cleanup
Marc-André Moreau [Mon, 26 May 2014 16:43:43 +0000 (12:43 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Mon, 26 May 2014 16:43:30 +0000 (12:43 -0400)]
libfreerdp-codec: cleanup context state flushing
Marc-André Moreau [Mon, 26 May 2014 16:30:58 +0000 (12:30 -0400)]
libfreerdp-core: add new protocol metrics module
Marc-André Moreau [Mon, 26 May 2014 12:10:28 +0000 (08:10 -0400)]
Merge pull request #1864 from MartinHaimberger/namedpipefix
fixed introduced winpr bug in namedpipes
Martin Haimberger [Mon, 26 May 2014 10:04:22 +0000 (03:04 -0700)]
fixed introduced winpr bug in namedpipes
Bug was introduced by
5e09e37d42bd8896a687df830a95f5cb56e4d47c
Marc-André Moreau [Mon, 26 May 2014 01:59:36 +0000 (21:59 -0400)]
Merge pull request #1863 from awakecoding/master
RDP6.1 XCrush Bulk Compression
Marc-André Moreau [Mon, 26 May 2014 01:39:25 +0000 (21:39 -0400)]
libfreerdp-codec: fix xcrush level-1 compressor
Marc-André Moreau [Mon, 26 May 2014 01:21:51 +0000 (21:21 -0400)]
libfreerdp-codec: cleanup and fix XCrush context flush synchronization
Marc-André Moreau [Mon, 26 May 2014 00:35:54 +0000 (20:35 -0400)]
libfreerdp-codec: fix xcrush packet flushing
Marc-André Moreau [Mon, 26 May 2014 00:01:12 +0000 (20:01 -0400)]
libfreerdp-codec: start compressing some XCrush frames
Marc-André Moreau [Fri, 23 May 2014 21:38:10 +0000 (17:38 -0400)]
libfreerdp-codec: improve xcrush compressor error checking
Marc-André Moreau [Fri, 23 May 2014 18:11:53 +0000 (14:11 -0400)]
libfreerdp-core: enable RDP6.1 XCrush compression/decompression by default
Marc-André Moreau [Fri, 23 May 2014 18:00:46 +0000 (14:00 -0400)]
winpr-crt: fix bit rotation macros
Marc-André Moreau [Fri, 23 May 2014 17:56:23 +0000 (13:56 -0400)]
Merge branch 'xcrush' of github.com:awakecoding/FreeRDP into xcrush
Marc-André Moreau [Fri, 23 May 2014 17:59:34 +0000 (13:59 -0400)]
libfreerdp-codec: add xcrush match optimization and output generation
Marc-André Moreau [Fri, 23 May 2014 17:56:14 +0000 (13:56 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into xcrush
Marc-André Moreau [Thu, 22 May 2014 21:38:01 +0000 (17:38 -0400)]
libfreerdp-codec: add match info functions
Marc-André Moreau [Thu, 22 May 2014 20:31:14 +0000 (16:31 -0400)]
winpr-crt: add bit rotation functions
Marc-André Moreau [Thu, 22 May 2014 20:16:21 +0000 (16:16 -0400)]
Merge pull request #1859 from awakecoding/master
Smart Card Improvements, TS Gateway non-blocking Writes Integration
Marc-André Moreau [Thu, 22 May 2014 20:09:52 +0000 (16:09 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into xcrush
Marc-André Moreau [Thu, 22 May 2014 20:08:10 +0000 (16:08 -0400)]
libfreerdp-core: fix windows build warning
Marc-André Moreau [Thu, 22 May 2014 19:56:47 +0000 (15:56 -0400)]
freerdp: fix incorrect copyright headers
Marc-André Moreau [Thu, 22 May 2014 19:32:49 +0000 (15:32 -0400)]
libwinpr-thread: fix compilation on Android
Marc-André Moreau [Thu, 22 May 2014 19:22:42 +0000 (15:22 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into xcrush
Marc-André Moreau [Thu, 22 May 2014 19:13:00 +0000 (15:13 -0400)]
libfreerdp-core: fix tcp_new on Windows
Marc-André Moreau [Thu, 22 May 2014 18:42:05 +0000 (14:42 -0400)]
freerdp: fix compilation on Windows
Marc-André Moreau [Thu, 22 May 2014 18:01:44 +0000 (14:01 -0400)]
Merge branch 'non_blocking_writes' of github.com:hardening/FreeRDP into non_blocking_writes
Marc-André Moreau [Thu, 22 May 2014 17:59:25 +0000 (13:59 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Thu, 22 May 2014 17:58:59 +0000 (13:58 -0400)]
Merge pull request #1857 from FreeRDP/mh-makecertfix
fixed missing extern C for cpp in makecert.h
Marc-André Moreau [Thu, 22 May 2014 17:50:01 +0000 (13:50 -0400)]
winpr: fix test compilation on Windows
Martin Haimberger [Wed, 21 May 2014 12:57:24 +0000 (05:57 -0700)]
fixed missing extern C for cpp in makecert.h
Marc-André Moreau [Thu, 22 May 2014 04:18:56 +0000 (00:18 -0400)]
libfreerdp-core: add xcrush signature db
Marc-André Moreau [Thu, 22 May 2014 02:55:45 +0000 (22:55 -0400)]
libfreerdp-codec: add xcrush rolling hash chunker
Hardening [Wed, 21 May 2014 20:20:38 +0000 (22:20 +0200)]
Correctly export ringbuffer function and fix a warning
Hardening [Wed, 21 May 2014 20:18:38 +0000 (22:18 +0200)]
Add .gitignore files for test generated files
Hardening [Wed, 21 May 2014 17:13:40 +0000 (19:13 +0200)]
Fixed invalid declaration and missing argument
Hardening [Wed, 21 May 2014 17:12:51 +0000 (19:12 +0200)]
Fix ringbuffer_write() to use const BYTE * instead of const void *
Hardening [Wed, 21 May 2014 16:44:49 +0000 (18:44 +0200)]
Updated license headers
Hardening [Wed, 21 May 2014 16:32:59 +0000 (18:32 +0200)]
Fix some corner cases in ringbuffer and make unitary test have no leak
Hardening [Wed, 21 May 2014 16:17:39 +0000 (18:17 +0200)]
Make ringbuffer C89 aware for VC
Hardening [Wed, 21 May 2014 15:32:14 +0000 (17:32 +0200)]
Allow transport_write calls to be non-blocking
This big patch allows to have non-blocking writes. To achieve
this, it slightly changes the way transport is handled. The misc transport
layers are handled with OpenSSL BIOs. In the chain we insert a
bufferedBIO that will bufferize write calls that couldn't be honored.
For an access with Tls security the BIO chain would look like this:
FreeRdp Code ===> SSL bio ===> buffered BIO ===> socket BIO
The buffered BIO will store bytes that couldn't be send because of
blocking write calls.
This patch also rework TSG so that it would look like this in the
case of SSL security with TSG:
(TSG in)
> SSL BIO => buffered BIO ==> socket BIO
/
FreeRdp => SSL BIO => TSG BIO
\
> SSL BIO => buffered BIO ==> socket BIO
(TSG out)
So from the FreeRDP point of view sending something is only BIO_writing
on the frontBio (last BIO on the left).
Hardening [Wed, 21 May 2014 13:54:25 +0000 (15:54 +0200)]
Fix OOM situation
Hardening [Wed, 21 May 2014 08:19:13 +0000 (10:19 +0200)]
Print function name when emiting an error
Hardening [Tue, 20 May 2014 20:39:21 +0000 (22:39 +0200)]
Add a ringbuffer implementation targetting byte sending
This adds a ringbuffer implementation that targets bytes sending.
The ringbuffer can grow when there's not enough room, that's why it's
not thread-safe (locking must be done externally). It will be shrinked
to its initial size as soon as the used bytes are the half of the
initial size.
Marc-André Moreau [Wed, 21 May 2014 15:17:58 +0000 (11:17 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Wed, 21 May 2014 15:02:16 +0000 (11:02 -0400)]
Merge pull request #1854 from zhangzl2013/floatbar
wfreerdp-floatbar: fix bug in non-fullscreen mode.
Marc-André Moreau [Wed, 21 May 2014 15:01:53 +0000 (11:01 -0400)]
Merge pull request #1853 from zhangzl2013/async
wfreerdp: add async input, update, transport and channels' events
Marc-André Moreau [Wed, 21 May 2014 15:01:12 +0000 (11:01 -0400)]
Merge pull request #1852 from orosam/auth3fix
Fix misplaced sec_trailer in rpc_auth_3 PDU
Marc-André Moreau [Wed, 21 May 2014 14:57:27 +0000 (10:57 -0400)]
Merge pull request #1845 from SBoyNumber1/DiskDrives
Removed autosharing of all disk drives during redirect of any drive.
Marc-André Moreau [Wed, 21 May 2014 14:56:56 +0000 (10:56 -0400)]
Merge pull request #1844 from caramorsimon/tokenrouting
Test for CRLF (0x0D0A) termination on the routing token
Marc-André Moreau [Wed, 21 May 2014 14:53:47 +0000 (10:53 -0400)]
Merge pull request #1826 from Hobby-Student/master
fix FreeBSD compile errors
Bernhard Miklautz [Wed, 21 May 2014 09:21:02 +0000 (11:21 +0200)]
Merge pull request #1762 from zhangzl2013/wfreerdp
wfreerdp: fix incorrect line color.
Zhang Zhaolong [Wed, 21 May 2014 08:13:55 +0000 (16:13 +0800)]
wfreerdp-floatbar: fix bug in non-fullscreen mode.
Zhang Zhaolong [Wed, 21 May 2014 06:52:57 +0000 (14:52 +0800)]
wfreerdp: add async input, update, transport and channels' events handling.
Hardening [Tue, 20 May 2014 20:10:17 +0000 (22:10 +0200)]
Merge pull request #1629 from bmiklautz/update_pull_1609
Android jpeg build enhancement