Commit Graph

6837 Commits

Author SHA1 Message Date
Marc-André Moreau
3854bdff29 Merge pull request #1885 from awakecoding/master
SmartCard fixes and workarounds
2014-06-04 12:41:08 -04:00
Marc-André Moreau
9e5d312919 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx 2014-06-04 12:37:23 -04:00
Marc-André Moreau
001ff64840 Merge pull request #1875 from jbd1986/fix-rdp-file-fullscreen
Reading RDP File: changed fullscreen constants to reflect the current states from Technet
2014-06-04 12:02:30 -04:00
Marc-André Moreau
886cd9b0c5 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-06-04 12:01:40 -04:00
Marc-André Moreau
00667fa75c Merge pull request #1872 from nfedera/fix-2014-05-28-01
winpr: rewrite named pipe sharing
2014-06-04 12:00:05 -04:00
Marc-André Moreau
e11d7d967e Merge pull request #1868 from akallabeth/x11_shutdown_fix
X11 aync input shutdown fix
2014-06-04 11:59:58 -04:00
Marc-André Moreau
e22b6897f2 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-06-04 11:56:37 -04:00
Vic Lee
63a1af4b35 transport: fix incorrect retval that caused unexpected redirect. 2014-06-04 15:57:27 +08:00
Martin Fleisz
d8061d23d6 Merge pull request #1882 from hardening/nla_fix
Nla fix
2014-06-04 09:30:34 +02:00
Marc-André Moreau
d6e955e6f1 channels/rdpgfx: stub bitmap decompression 2014-06-03 20:51:28 -04:00
Marc-André Moreau
280d1c859f channels/rdpgfx: parse all core egfx pdus 2014-06-03 19:48:47 -04:00
Marc-André Moreau
c9172dfdb3 channels/rdpgfx: start parsing pdus 2014-06-03 15:32:03 -04:00
Marc-André Moreau
a50e4d16fc libfreerdp-codec: integrate basic RDP8 decompression support 2014-06-03 14:29:55 -04:00
Marc-André Moreau
abd833c27e libfreerdp-codec: stub new ZGFX (RDP8) bulk compressor/decompressor 2014-06-03 13:38:10 -04:00
Marc-André Moreau
3d7524cac9 channels/drdynvc: add state machine, add workaround for missing capabilities pdu 2014-06-03 13:00:03 -04:00
Martin Fleisz
6f1f4be0ae Merge pull request #1873 from hardening/WTSVirtualChannelWriteCallers
Don't use NULL for pWrittenBytes when calling WTSVirtualChannelWrite()
2014-06-03 16:40:05 +02:00
Benoit LeBlanc
dd6ff1b56e Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-06-03 10:05:30 -04:00
Marc-André Moreau
8ea161de61 channels/drdynvc: add OnOpen callback 2014-06-03 09:49:00 -04:00
Hardening
462a26c8c3 Don't leak cert in case of failure 2014-06-03 15:19:00 +02:00
Hardening
a607b4553d Fix certificate leak
There were a leak when doing TLS in server mode
2014-06-03 14:59:58 +02:00
Hardening
183155dbd1 Fix metrics leak 2014-06-03 14:54:56 +02:00
Mike McDonald
4881ca6bc1 Fixed merge issue with smartcard_pcsc.c 2014-06-03 07:25:21 -04:00
Mike McDonald
ef1242c56c Merged changes from awakecoding/master 2014-06-03 07:05:31 -04:00
Mike McDonald
d1c764b374 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 ed8ea297e7.
2014-06-03 06:58:49 -04:00
Hardening
4f1b77408a Fix NLA authentication for server-side
This patch make copies of the server public key so that the NLA
authentication can be performed server-side.
2014-06-03 11:04:35 +02:00
Hardening
0ce300125b Drop unused field 2014-06-03 11:04:12 +02:00
Marc-André Moreau
e74fb24ad1 channels/rdpgfx: start working on capability sets 2014-06-03 00:05:43 -04:00
Marc-André Moreau
eb65777328 channels/disp: cleanup 2014-06-02 22:40:01 -04:00
Marc-André Moreau
267e95590b libfreerdp-client: fix /gfx option 2014-06-02 22:39:40 -04:00
Marc-André Moreau
659f80e172 libwinpr-smartcard: avoid using pcsc-lite's buggy transaction system 2014-06-02 21:49:49 -04:00
Marc-André Moreau
f5bfb98aca channels/smartcard: experiment with multiple card contexts 2014-06-02 17:20:01 -04:00
Marc-André Moreau
1359d7c27e Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP 2014-06-02 12:08:19 -04:00
Mike McDonald
ed8ea297e7 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). 2014-06-02 11:08:32 -04:00
Benoît LeBlanc
3e0cda919f Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-06-02 08:19:43 -04:00
Marc-André Moreau
90936e6484 Merge pull request #1879 from awakecoding/master
Async Transport BIO full duplex support
2014-06-01 22:35:13 -04:00
Marc-André Moreau
cd149ed167 libwinpr-winsock: fix non-monolithic build 2014-06-01 22:25:19 -04:00
Marc-André Moreau
abd475060c libwinpr-winsock: fix build on Windows 2014-06-01 21:52:33 -04:00
Marc-André Moreau
04968b18c4 libfreerdp-core: replace all OpenSSL built-in BIOs by new full duplex BIOs 2014-06-01 21:37:20 -04:00
Marc-André Moreau
1172596d59 libwinpr-winsock: initial winsock implementation 2014-06-01 15:04:28 -04:00
Marc-André Moreau
a8be174e03 libfreerdp-core: remove ineffective full duplex locks 2014-06-01 11:20:13 -04:00
Marc-André Moreau
2c8670d7b3 Merge branch 'master' of github.com:awakecoding/FreeRDP 2014-06-01 10:46:58 -04:00
Marc-André Moreau
1ac2350ec5 libfreerdp-core: fail more gracefully when transport thread dies 2014-06-01 10:46:43 -04:00
Marc-André Moreau
1ddd6c5e0d libwinpr-utils: add WLog support for Win32 debugger console output 2014-05-31 10:10:19 -04:00
Marc-André Moreau
ad978a1cd7 Merge pull request #1877 from awakecoding/master
WLog, Transport, Gateway, Time
2014-05-30 15:35:46 -04:00
Marc-André Moreau
c5e4c74bb6 libfreerdp-core: fix build on Windows 2014-05-30 15:29:06 -04:00
Benoît LeBlanc
584a0cbfb5 Merge branch 'master' of git://github.com/awakecoding/FreeRDP
# By Hardening (4) and others
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe)
  transport: add another null pointer check.
  transport: add a null pointer check.
  rdpsnd/server: fix incorrect use of channe handle.
  tcp: add timeout to prevent buggy client from hanging.
  Check that bpp has reasonable value
  Check for bpp > 0
  Set checks to be strict and also check xorBpp field
  Fixes for CVE-2014-0250
2014-05-30 15:23:10 -04:00
Marc-André Moreau
98077cfc24 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/core/transport.c
2014-05-30 15:06:07 -04:00
Marc-André Moreau
b1416af362 libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe) 2014-05-30 14:53:10 -04:00
Benoît LeBlanc
0f56b1a3dd Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-05-30 14:42:49 -04:00
Marc-André Moreau
d2ad5f698b libfreerdp-core: fix VerifyX509Certificate to make distinction between gateway and direct connection 2014-05-30 14:36:18 -04:00