Rostislav Kondratenko
3f81ff87a6
Removing private context on hCard so that transaction will properly unlock when context is released.
2015-07-17 18:13:41 +03:00
Rostislav Kondratenko
7248ea98d0
Fixing condition on SCardIsValidContext to be true when context is valid
2015-07-17 18:13:02 +03:00
Rostislav Kondratenko
f2863fabf5
Re-enabled PCSC-Lite transactions and fixed smartcard deinitialization so it will release all contexts to unblock calls waiting for transactions
2015-07-17 16:37:44 +03:00
MartinHaimberger
43a5680b03
Merge pull request #2791 from bmiklautz/100percent
...
transport: fix regression introduced with PR #2770
2015-07-17 12:30:20 +02:00
Bernhard Miklautz
458d3b1593
transport: fix regression introduced with PR #2770
...
When the event is reset in transport_check_fds xfreerdp doesn't work and
consumes 100% CPU (see #2790 ). On windows this is require otherwise the
CPU consumption is 100% there.
This quick fix only resets the event on windows. It's a working approach
but definitely not the final solution.
2015-07-17 12:06:41 +02:00
Armin Novak
9af2e22d51
Fixed mutex unlocking and return checks.
2015-07-16 17:07:29 +02:00
Vic Lee
042cb250f3
Merge pull request #2770 from akallabeth/bio_event_reset
...
Resetting frontBio after read now.
2015-07-16 06:57:46 -07:00
MartinHaimberger
45f9519b58
Merge pull request #2723 from akallabeth/pwd_from_stdin
...
New /from-stdin
2015-07-15 14:12:13 +02:00
MartinHaimberger
b0eccc9392
Merge pull request #2786 from mfleisz/fix_makecert
...
winpr/tools: Fixed x509_get_default_name failing with long computer names
2015-07-15 14:10:44 +02:00
Martin Haimberger
e682329eeb
fixed compiler errors
2015-07-15 03:17:38 -07:00
Martin Fleisz
1a6aba0130
winpr/tools: Fixed x509_get_default_name failing with long computer names
2015-07-15 11:47:01 +02:00
Martin Haimberger
6ab0187d84
Merge remote-tracking branch 'upstream/master' into mh-channel
...
Conflicts:
channels/audin/client/oss/audin_oss.c
channels/drive/client/drive_main.c
channels/printer/client/printer_cups.c
channels/printer/client/printer_main.c
channels/rail/client/rail_main.c
channels/rdpgfx/client/rdpgfx_main.c
channels/rdpsnd/client/oss/rdpsnd_oss.c
channels/remdesk/client/remdesk_main.c
channels/remdesk/server/remdesk_main.c
channels/tsmf/client/tsmf_media.c
2015-07-15 01:57:07 -07:00
Martin Haimberger
b8c110d19b
introduced channel error reporting system
...
The rdpContext gets an event which will
get set if an error occoured in a channel.
If a thread or a void callback has to report an
error it will get signaled by this system.
2015-07-15 00:50:35 -07:00
MartinHaimberger
b06d83ba80
Merge pull request #2766 from akallabeth/snprintf_to_sprintf_s
...
Replaced snprintf with sprintf_s
2015-07-15 09:47:43 +02:00
Bernhard Miklautz
c12bc0ec70
Merge pull request #2782 from bmiklautz/order_does_matter
...
x11: reorder xf_post_disconnect
2015-07-14 15:50:32 +02:00
Bernhard Miklautz
f589d5d6e0
x11: reorder xf_post_disconnect
...
Channels like EGFX need resources like the main window in order to
work correctly. Before the window, GDI,.. is freed it needs to be
ensured that all channels are stopped properly to prevent them to access
already freed resources. Disconnecting the channels first fixed a
possible race condition/SEGFAULT that could occur with remote initiated
disconnects.
2015-07-14 15:28:55 +02:00
MartinHaimberger
e2b4bf699e
Merge pull request #2781 from bmiklautz/fdread
...
winpr/synch: remove the dependency on winsock.h
2015-07-14 13:02:41 +02:00
Bernhard Miklautz
1a0253ef93
winpr/handle: define WINPR_FD_ on all platforms
2015-07-14 12:21:24 +02:00
Bernhard Miklautz
68e8569110
winpr/synch: remove the dependency on winsock.h
...
winsock.h pulls in a lot of defines and dependencies that are not
required and partially unwanted in winpr's core (for parts that are not
related to network). In order to get rid of this dependency and have an
independent defines for extended winpr functions the WINPR_FD_* defines
are used internally (and for exposed functions). Where required, like in
WSAEventSelect, the FD_* is mapped to WINPR_FD_*.
2015-07-14 11:39:41 +02:00
Bernhard Miklautz
920617e1bc
Merge pull request #2778 from akallabeth/cert_store_compare_fix
...
Fixed comparison bug, cleanup and error handling.
2015-07-13 17:52:18 +02:00
Armin Novak
fc929fbc7f
Using lowercase hostname for comparison now.
...
fixed argument mixup.
2015-07-13 15:52:06 +02:00
Armin Novak
ca7c34ff35
Fixed comparison bug, cleanup and error handling.
2015-07-13 14:16:04 +02:00
Armin Novak
098eda9873
Error checks for BIO_get_event
...
ResetEvent before reading data from transport BIO.
2015-07-09 12:20:22 +02:00
Martin Haimberger
d9e2834a70
channel smartcard hardend
2015-07-09 03:00:19 -07:00
Armin Novak
18cea1c9ba
Replaced cbMaxSignature with cbSecurityTrailer
...
The token buffer size during authentication was constructed
from the wrong buffer size. These sizes are equal in case of
local account logins but differ with domain accounts.
2015-07-09 10:09:18 +02:00
Armin Novak
ecf6ffdcce
Fixed CompleteAuthToken return check.
2015-07-09 09:57:45 +02:00
Armin Novak
cb01e540ba
Fixed CompleteAuthToken return check.
2015-07-09 09:49:12 +02:00
Marc-André Moreau
aae86d61ce
channels/rdpgfx: fix TotalDecodedFrames counter
2015-07-08 14:16:29 -04:00
Armin Novak
2fe5ecfc1b
Fixed wrong output in log messages.
2015-07-08 17:41:23 +02:00
Martin Fleisz
9a2d33af12
Fixed missing encrypt / decrypt success check.
...
The return of EncryptMessage and DecryptMessage was unchecked.
This lead to PLAINTEXT to be sent over the wire, a major security
issue.
2015-07-08 17:41:23 +02:00
Armin Novak
48ccf73a36
More SSPI logging.
2015-07-08 17:41:22 +02:00
Armin Novak
5b0ee9b7ab
Error checks and readable log messages.
2015-07-08 17:41:22 +02:00
Armin Novak
7360cb638a
Erasing memory on credentials or SecBuffer free.
2015-07-08 17:41:21 +02:00
Martin Fleisz
3b87cc0c07
Fixed server and client NLA state machine.
...
When using NULL credentials (current context)
the server state machine did not send back the
required authentication token.
On client side erroneous checks prevented sending
the appropriate public key.
2015-07-08 17:41:21 +02:00
Marc-André Moreau
23f9b3bbc0
channels/rdpgfx: reset state on channel close
2015-07-08 11:17:56 -04:00
Marc-André Moreau
11f785290f
channels/drdynvc: use same status code as mstsc for DVC opening failure
2015-07-07 13:36:36 -04:00
Armin Novak
0120ee75ca
Resetting frontBio after read now.
2015-07-07 14:48:27 +02:00
Marc-André Moreau
3781e803ed
channels/rdpgfx: improve frame ack handling
2015-07-06 16:28:52 -04:00
MartinHaimberger
ba34ff6096
Merge pull request #1 from hardening/mhchannel
...
Mhchannel
2015-07-06 16:52:19 +02:00
David FORT
b83ab92776
Hardened urbdrc channel
2015-07-06 16:46:21 +02:00
David FORT
1b7140d84e
Fixed some more checks in rdpsnd channel
2015-07-04 00:17:37 +02:00
Armin Novak
cf9f975341
Replaced snprintf with sprintf_s
2015-07-03 13:26:15 +02:00
MartinHaimberger
358289fb51
Merge pull request #2764 from akallabeth/pull_fixes
...
Pull fixes
2015-07-03 13:04:37 +02:00
Armin Novak
40a7f2c995
Added missing include breaking windows build.
2015-07-03 12:46:28 +02:00
Armin Novak
776f15e135
Fixed inverted bAttached setting.
...
If bAttached is TRUE, the resources of the event are not
cleaned up on CloseHandle.
2015-07-03 12:42:04 +02:00
MartinHaimberger
282f15795d
Merge pull request #2762 from akallabeth/handle_write_event
...
Add write event support to HANDLE
2015-07-03 11:36:00 +02:00
Armin Novak
4e7c03fabf
Added error checks and resource cleanup.
2015-07-03 11:26:22 +02:00
Armin Novak
c21de0dae6
Fixed pr comments.
2015-07-03 11:13:48 +02:00
MartinHaimberger
83641a3a97
Merge pull request #2761 from akallabeth/sample_server_port_arg
...
Updated sample server.
2015-07-03 10:44:35 +02:00
Armin Novak
82da97e606
Updated sample server.
...
* Added new command line argument --port to allow starting the
sample server on a port different than default 3389.
* Using GetKnownSubPath now to determine location of temporary
directory for server socket.
* Using distinct server socket files for each port.
2015-07-03 10:04:24 +02:00