platform/upstream/freerdp.git
6 years agoMerge pull request #4711 from akallabeth/command_line_cleanup_rework
David Fort [Tue, 19 Jun 2018 14:48:05 +0000 (16:48 +0200)]
Merge pull request #4711 from akallabeth/command_line_cleanup_rework

Command line cleanup rework

6 years agoFixed memory leak in command line value parsing.
Armin Novak [Tue, 19 Jun 2018 10:55:29 +0000 (12:55 +0200)]
Fixed memory leak in command line value parsing.

6 years agoFIX: moved declarations above the statements for strict C 90 compliance.
Pascal J. Bourguignon [Thu, 7 Jun 2018 11:29:44 +0000 (13:29 +0200)]
FIX: moved declarations above the statements for strict C 90 compliance.

6 years agoCleaned up const char** -> char** for argv, since we definitely do modify the argv!
Pascal J. Bourguignon [Wed, 6 Jun 2018 14:43:09 +0000 (16:43 +0200)]
Cleaned up const char** -> char** for argv, since we definitely do modify the argv!
(we overwrite the password and pin arguments).
This implies changes in the argument parsing tests that now must pass a mutable argv
(copied from the statically declared test argvs).
Some other const inconsistency have been dealt with too.

6 years agoMerge pull request #4694 from akallabeth/mic_crash_fix
David Fort [Mon, 4 Jun 2018 09:29:01 +0000 (11:29 +0200)]
Merge pull request #4694 from akallabeth/mic_crash_fix

Fixed #4693: Fix integer underflow in encoder loop.

6 years agoFixed #4693: Fix integer underflow in encoder loop.
Armin Novak [Mon, 4 Jun 2018 08:14:29 +0000 (10:14 +0200)]
Fixed #4693: Fix integer underflow in encoder loop.

6 years agoMerge pull request #4683 from akallabeth/ffmpeg_found_fix
Martin Fleisz [Wed, 30 May 2018 10:39:17 +0000 (12:39 +0200)]
Merge pull request #4683 from akallabeth/ffmpeg_found_fix

Nightly build fix

6 years agoFixed case of variable names.
Armin Novak [Wed, 30 May 2018 10:13:24 +0000 (12:13 +0200)]
Fixed case of variable names.

6 years agoMerge pull request #4677 from akallabeth/build_dep_fix
Martin Fleisz [Tue, 29 May 2018 10:10:53 +0000 (12:10 +0200)]
Merge pull request #4677 from akallabeth/build_dep_fix

Fix #4672: Check if FFMPEG and OpenH264 detected

6 years agoFix #4672: Check if FFMPEG and OpenH264 detected
Armin Novak [Mon, 28 May 2018 13:30:50 +0000 (15:30 +0200)]
Fix #4672: Check if FFMPEG and OpenH264 detected

When FFMPEG or OpenH264 was requested but not detected abort
the cmake run with an error.

6 years agoMerge pull request #4665 from FreeRDP/akallabeth-patch-1
Martin Fleisz [Tue, 22 May 2018 14:22:10 +0000 (16:22 +0200)]
Merge pull request #4665 from FreeRDP/akallabeth-patch-1

Update issue templates

6 years agoUpdate issue templates
akallabeth [Fri, 18 May 2018 07:03:30 +0000 (09:03 +0200)]
Update issue templates

6 years agoprimitives: ensure primitives_get() returns a populated struct
Mike Gilbert [Wed, 16 May 2018 20:15:50 +0000 (16:15 -0400)]
primitives: ensure primitives_get() returns a populated struct

Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658

6 years agoMerge pull request #4654 from akallabeth/alsa_latency_patch
David Fort [Wed, 16 May 2018 07:53:30 +0000 (09:53 +0200)]
Merge pull request #4654 from akallabeth/alsa_latency_patch

Return real alsa latency if buffer is filled.

6 years agoReturn real alsa latency if buffer is filled.
Armin Novak [Wed, 16 May 2018 06:45:17 +0000 (08:45 +0200)]
Return real alsa latency if buffer is filled.

6 years agoMerge pull request #4653 from rjcorrig/kb4093753
akallabeth [Wed, 16 May 2018 06:01:09 +0000 (08:01 +0200)]
Merge pull request #4653 from rjcorrig/kb4093753

winpr: Updates time zone data to April 2018

6 years agoUpdate time zone data to April 2018
Robert Corrigan [Tue, 15 May 2018 19:53:36 +0000 (15:53 -0400)]
Update time zone data to April 2018

6 years agoMerge pull request #4651 from akallabeth/loadepng_memleak_fix
Martin Fleisz [Tue, 15 May 2018 14:29:27 +0000 (16:29 +0200)]
Merge pull request #4651 from akallabeth/loadepng_memleak_fix

Fixed loadepng memory leak.

6 years agoMerge pull request #4648 from akallabeth/nsc_free_fix
Martin Fleisz [Tue, 15 May 2018 13:09:49 +0000 (15:09 +0200)]
Merge pull request #4648 from akallabeth/nsc_free_fix

Fixed #4647: nsc_context_free must not access possibly uninitialized fields

6 years agoFix missing sound arrival time for wave2 PDU
Armin Novak [Tue, 15 May 2018 12:57:00 +0000 (14:57 +0200)]
Fix missing sound arrival time for wave2 PDU

6 years agoFixed loadepng memory leak.
Armin Novak [Tue, 15 May 2018 12:30:04 +0000 (14:30 +0200)]
Fixed loadepng memory leak.

6 years agoMerge pull request #4637 from akallabeth/win_ninja_support
Martin Fleisz [Tue, 15 May 2018 11:47:28 +0000 (13:47 +0200)]
Merge pull request #4637 from akallabeth/win_ninja_support

VS2017 support: set pdb output directory for Ninja generator.

6 years agoMerge pull request #4631 from akallabeth/santizer_fixes
Martin Fleisz [Tue, 15 May 2018 11:46:57 +0000 (13:46 +0200)]
Merge pull request #4631 from akallabeth/santizer_fixes

Fix #4628: CommandLineFindNextArgumentA must check the current argument

6 years agoFixed #4647: nsc_context_free must not access possibly uninitialized fields.
Armin Novak [Tue, 15 May 2018 07:13:00 +0000 (09:13 +0200)]
Fixed #4647: nsc_context_free must not access possibly uninitialized fields.

6 years agoMerge pull request #4638 from akallabeth/known_hosts_comment_support
David Fort [Mon, 14 May 2018 13:04:34 +0000 (15:04 +0200)]
Merge pull request #4638 from akallabeth/known_hosts_comment_support

Added comment support for known_hosts format.

6 years agoAdded comment support for known_hosts format.
Armin Novak [Fri, 11 May 2018 09:09:54 +0000 (11:09 +0200)]
Added comment support for known_hosts format.

6 years agoFixed invalid function argument for ntlm_compute_message_integrity_check
Armin Novak [Fri, 11 May 2018 09:00:46 +0000 (11:00 +0200)]
Fixed invalid function argument for ntlm_compute_message_integrity_check

6 years agoFixed compiler warnings (unused)
Armin Novak [Fri, 11 May 2018 09:00:01 +0000 (11:00 +0200)]
Fixed compiler warnings (unused)

6 years agoFixed #4629: Only call freerdp_channels_post_connect when it was connected.
Armin Novak [Sun, 6 May 2018 09:17:08 +0000 (11:17 +0200)]
Fixed #4629: Only call freerdp_channels_post_connect when it was connected.

In rdp_client_redirect or rdp_client_reconnect freerdp_channels_post_connect must
be called if the channels were connected previously.
This might not be the case, skip that call then.

6 years agoVS2017 support: set pdb output directory for Ninja generator.
Armin Novak [Fri, 11 May 2018 08:37:50 +0000 (10:37 +0200)]
VS2017 support: set pdb output directory for Ninja generator.

6 years agoFix #4628: CommandLineFindNextArgumentA must check the current argument
Armin Novak [Sun, 6 May 2018 08:49:05 +0000 (10:49 +0200)]
Fix #4628: CommandLineFindNextArgumentA must check the current argument

When determining if there is a next argument first check the current one
for abort criteria.

6 years agoMerge pull request #4610 from akallabeth/cmd_strtol_fix
Martin Fleisz [Fri, 4 May 2018 11:28:18 +0000 (13:28 +0200)]
Merge pull request #4610 from akallabeth/cmd_strtol_fix

Fix #4597: Do string argument checks before a possible strtol

6 years agoMerge pull request #4623 from akallabeth/mac_sound_backend_fix
Martin Fleisz [Fri, 4 May 2018 11:08:45 +0000 (13:08 +0200)]
Merge pull request #4623 from akallabeth/mac_sound_backend_fix

Fixed mac sound backend initialization.

6 years agoMerge pull request #4627 from akallabeth/clang_warning_fixes
Martin Fleisz [Fri, 4 May 2018 11:07:01 +0000 (13:07 +0200)]
Merge pull request #4627 from akallabeth/clang_warning_fixes

Clang warning fixes

6 years agoFixed uninitialized return and early resource cleanup.
Armin Novak [Fri, 4 May 2018 10:36:29 +0000 (12:36 +0200)]
Fixed uninitialized return and early resource cleanup.

6 years agoFixed uninitialized value.
Armin Novak [Fri, 4 May 2018 10:36:18 +0000 (12:36 +0200)]
Fixed uninitialized value.

6 years agoFixed missing NULL pointer checks.
Armin Novak [Fri, 4 May 2018 10:35:51 +0000 (12:35 +0200)]
Fixed missing NULL pointer checks.

6 years agoMerge pull request #4624 from akallabeth/pth_fix
Martin Fleisz [Fri, 4 May 2018 09:59:21 +0000 (11:59 +0200)]
Merge pull request #4624 from akallabeth/pth_fix

Fixed /pth: Consistently treat the hash offset to password length.

6 years agoDo not set password to identity if pth is used.
Armin Novak [Fri, 4 May 2018 07:54:49 +0000 (09:54 +0200)]
Do not set password to identity if pth is used.

6 years agoMerge pull request #4611 from akallabeth/argument_warnings
Martin Fleisz [Fri, 4 May 2018 08:06:42 +0000 (10:06 +0200)]
Merge pull request #4611 from akallabeth/argument_warnings

Argument warnings

6 years agoMerge pull request #4625 from dualmoon/fix-hisher-pronouns
akallabeth [Fri, 4 May 2018 08:04:37 +0000 (10:04 +0200)]
Merge pull request #4625 from dualmoon/fix-hisher-pronouns

First person "they" pronouns in logoff message

6 years agoFixed formats supported by backend.
Armin Novak [Fri, 4 May 2018 07:44:06 +0000 (09:44 +0200)]
Fixed formats supported by backend.

6 years agoAdded error log messages.
Armin Novak [Fri, 4 May 2018 07:10:31 +0000 (09:10 +0200)]
Added error log messages.

6 years agoFirst person "they" pronouns in logoff message
Ashley Davis [Thu, 3 May 2018 16:11:13 +0000 (12:11 -0400)]
First person "they" pronouns in logoff message

6 years agoFixed /pth: Consistently treat the hash offset to password length.
Armin Novak [Thu, 3 May 2018 15:49:14 +0000 (17:49 +0200)]
Fixed /pth: Consistently treat the hash offset to password length.

6 years agoFixed mac sound backend initialization.
Armin Novak [Thu, 3 May 2018 14:12:12 +0000 (16:12 +0200)]
Fixed mac sound backend initialization.

6 years agoMerge pull request #4620 from akallabeth/bio_ctrl_fix
Martin Fleisz [Thu, 3 May 2018 11:35:20 +0000 (13:35 +0200)]
Merge pull request #4620 from akallabeth/bio_ctrl_fix

Bio ctrl fix

6 years agoFixed formatting.
Armin Novak [Thu, 3 May 2018 10:25:52 +0000 (12:25 +0200)]
Fixed formatting.

6 years agoFixed #4476: broken casts/variable sizes for custom BIO calls.
Armin Novak [Thu, 3 May 2018 10:24:16 +0000 (12:24 +0200)]
Fixed #4476: broken casts/variable sizes for custom BIO calls.

6 years agoMerge pull request #4453 from akallabeth/sound_channel_refactor
David Fort [Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)]
Merge pull request #4453 from akallabeth/sound_channel_refactor

Sound channel refactoring

6 years agoMerge pull request #4617 from kevans91/spurious
akallabeth [Thu, 3 May 2018 09:55:03 +0000 (11:55 +0200)]
Merge pull request #4617 from kevans91/spurious

Upstream the rest of our local FreeBSD patching

6 years agoMerge pull request #4613 from kevans91/file64
akallabeth [Thu, 3 May 2018 09:31:54 +0000 (11:31 +0200)]
Merge pull request #4613 from kevans91/file64

Enable 64-bit file support on FreeBSD as well

6 years agoMerge pull request #4616 from kevans91/timerfd-nonblock
akallabeth [Thu, 3 May 2018 08:56:04 +0000 (10:56 +0200)]
Merge pull request #4616 from kevans91/timerfd-nonblock

Pass TFD_NONBLOCK to timerfd_create to avoid later fcntl

6 years agoMerge pull request #4596 from p-pautov/rdg_ssl_fixes
Martin Fleisz [Thu, 3 May 2018 08:23:12 +0000 (10:23 +0200)]
Merge pull request #4596 from p-pautov/rdg_ssl_fixes

RDG related fixes for better compatibility with mstsc

6 years agoFixed treat_wave sample length and checks.
Armin Novak [Thu, 3 May 2018 08:08:56 +0000 (10:08 +0200)]
Fixed treat_wave sample length and checks.

6 years agoMerge pull request #4614 from kevans91/cmakemod
akallabeth [Thu, 3 May 2018 07:49:31 +0000 (09:49 +0200)]
Merge pull request #4614 from kevans91/cmakemod

Abstract away CMake module installation setting, install differently on FreeBSD

6 years agoMerge pull request #4618 from kevans91/buildtest
akallabeth [Thu, 3 May 2018 06:55:23 +0000 (08:55 +0200)]
Merge pull request #4618 from kevans91/buildtest

Pull in the libepoll-shim includes for libwinpr's synch/test

6 years agoPull in the libepoll-shim includes for libwinpr's synch/test
Kyle Evans [Thu, 3 May 2018 04:19:44 +0000 (23:19 -0500)]
Pull in the libepoll-shim includes for libwinpr's synch/test

This allows FreeBSD to successfully build with BUILD_TESTING enabled. Currently,
only 3/184 tests fail:

 13 - TestLibraryLoadLibrary (Failed)
 14 - TestLibraryGetProcAddress (Failed)
 15 - TestLibraryGetModuleFileName (Failed)

These failures are probably due to a lack of GetModuleFileNameA implementation
on FreeBSD.

6 years agoUpstream the rest of our local FreeBSD patching
Kyle Evans [Wed, 2 May 2018 15:57:16 +0000 (10:57 -0500)]
Upstream the rest of our local FreeBSD patching

FreeBSD/DragonflyBSD are also UNIX platforms, as far as trio is concerned, and
we don't need to be setting the CMAKE_INSTALL_RPATH on FreeBSD.

6 years agoPass TFD_NONBLOCK to timerfd_create to avoid later fcntl
Kyle Evans [Thu, 3 May 2018 02:03:49 +0000 (21:03 -0500)]
Pass TFD_NONBLOCK to timerfd_create to avoid later fcntl

6 years agoMerge pull request #4576 from ccpp/bugfix-rdg-poll
akallabeth [Wed, 2 May 2018 15:59:10 +0000 (17:59 +0200)]
Merge pull request #4576 from ccpp/bugfix-rdg-poll

Fix polling in RDG

6 years agoMerge pull request #4612 from kevans91/mandest
akallabeth [Wed, 2 May 2018 15:54:57 +0000 (17:54 +0200)]
Merge pull request #4612 from kevans91/mandest

Follow OpenBSD convention when installing manpages on FreeBSD

6 years agoEnable 64-bit file support on FreeBSD as well
Kyle Evans [Wed, 2 May 2018 14:59:33 +0000 (09:59 -0500)]
Enable 64-bit file support on FreeBSD as well

6 years agoUse SetFreeRDPCMakeInstallDir where CMake modules are installed
Kyle Evans [Wed, 2 May 2018 15:03:53 +0000 (10:03 -0500)]
Use SetFreeRDPCMakeInstallDir where CMake modules are installed

6 years agoAdd SetFreeRDPCMakeInstallDir function to abstract away platform differences
Kyle Evans [Wed, 2 May 2018 15:32:26 +0000 (10:32 -0500)]
Add SetFreeRDPCMakeInstallDir function to abstract away platform differences

Different platforms/systems may install CMake modules into different places. For
instance, FreeBSD will install modules into ${PREFIX}/share/cmake/Modules while
Linux distributions might install into ${PREFIX}/lib/cmake.

This leaves us with a useful abstraction- consumers only need to care about
the name of their subdirectory, and only one place needs to be patched to change
where this subdirectory lands.

6 years agoFollow OpenBSD convention when installing manpages on FreeBSD
Kyle Evans [Wed, 2 May 2018 14:31:19 +0000 (09:31 -0500)]
Follow OpenBSD convention when installing manpages on FreeBSD

Both OS install third party man pages into ${PREFIX}/man/man${SECTION}, rather
than the convention established in the base system of share/man/man${SECTION}.

6 years agoFixed invalid argument parameter
Armin Novak [Wed, 2 May 2018 11:08:30 +0000 (13:08 +0200)]
Fixed invalid argument parameter

6 years agoFixed argument warning.
Armin Novak [Wed, 2 May 2018 11:08:17 +0000 (13:08 +0200)]
Fixed argument warning.

6 years agoFix #4597: Do string argument checks before a possible strtol
Armin Novak [Wed, 2 May 2018 10:57:34 +0000 (12:57 +0200)]
Fix #4597: Do string argument checks before a possible strtol

strtol sets errno, which must be reset if it is no abort condition.
Invert the comparisons to avoid that.

6 years agoMerge pull request #4608 from akallabeth/posix_timer_cmake_check
Martin Fleisz [Wed, 2 May 2018 10:11:24 +0000 (12:11 +0200)]
Merge pull request #4608 from akallabeth/posix_timer_cmake_check

Determine posix timer use by function availability

6 years agoMerge pull request #4570 from akallabeth/toolchain_fix
David Fort [Wed, 2 May 2018 10:09:55 +0000 (12:09 +0200)]
Merge pull request #4570 from akallabeth/toolchain_fix

android Toolchain fix

6 years agoMerge pull request #4603 from hardening/socksplus
Martin Fleisz [Wed, 2 May 2018 09:26:13 +0000 (11:26 +0200)]
Merge pull request #4603 from hardening/socksplus

SOCKS5 proxy support

6 years agoDetermine posix timer availability by function availability
Armin Novak [Wed, 2 May 2018 06:40:30 +0000 (08:40 +0200)]
Determine posix timer availability by function availability

To avoid having to whitelist every os starting to implement posix
timer API just detect if the functions are available.

6 years agoproxy: cleanup SOCKS support and add user/password support
David Fort [Sun, 29 Apr 2018 19:25:28 +0000 (21:25 +0200)]
proxy: cleanup SOCKS support and add user/password support

6 years agoMerge pull request #4606 from kevans91/libressl-fixes
David Fort [Wed, 2 May 2018 08:39:22 +0000 (10:39 +0200)]
Merge pull request #4606 from kevans91/libressl-fixes

Pull in the LibreSSL compatibility patches from FreeBSD

6 years agoMerge pull request #4609 from akallabeth/clipboard_return_check
Martin Fleisz [Wed, 2 May 2018 08:10:55 +0000 (10:10 +0200)]
Merge pull request #4609 from akallabeth/clipboard_return_check

Added proper return value checks for clipboard data.

6 years agoMerge pull request #4607 from kevans91/epoll
David Fort [Wed, 2 May 2018 07:47:17 +0000 (09:47 +0200)]
Merge pull request #4607 from kevans91/epoll

FreeBSD: epoll/timerfd support

6 years agosocks proxy reply fix
Jiri Sasek [Mon, 23 Apr 2018 18:30:08 +0000 (20:30 +0200)]
socks proxy reply fix

6 years agoAdded proper return value checks for clipboard data.
Armin Novak [Wed, 2 May 2018 07:21:42 +0000 (09:21 +0200)]
Added proper return value checks for clipboard data.

6 years agoUse shared memory instead of temp files on FreeBSD-compatible OS
Kyle Evans [Wed, 2 May 2018 04:50:15 +0000 (23:50 -0500)]
Use shared memory instead of temp files on FreeBSD-compatible OS

6 years agoPull in libepoll-shim for the bits that require timerfd/epoll
Kyle Evans [Wed, 2 May 2018 04:42:25 +0000 (23:42 -0500)]
Pull in libepoll-shim for the bits that require timerfd/epoll

libepoll-shim is our implementation of this API on top of kevent. It supplies
the same headers and a library, but we don't install it in any of the default
include search paths when it comes in through ports on an as-needed basis.

This set of changes is restricted to FREEBSD-compatible OS, which includes
DragonflyBSD and FreeBSD.

6 years agoSet BSD/FREEBSD for DragonflyBSD
Kyle Evans [Wed, 2 May 2018 04:38:48 +0000 (23:38 -0500)]
Set BSD/FREEBSD for DragonflyBSD

DragonflyBSD was a fork of FreeBSD once upon a time. As far as FreeRDP is
concerned, DragonflyBSD is FreeBSD-compatible and DragonflyBSD in-fact uses
the FreeBSD ports tree (+ patches)

6 years agoPull in the LibreSSL compatibility patches from FreeBSD
Kyle Evans [Tue, 1 May 2018 13:43:36 +0000 (08:43 -0500)]
Pull in the LibreSSL compatibility patches from FreeBSD

6 years agoAdded libavcodec version check for dsp-ffmpeg component.
Armin Novak [Fri, 27 Apr 2018 09:28:37 +0000 (11:28 +0200)]
Added libavcodec version check for dsp-ffmpeg component.

Abort compilation with a specific error if the libavcodec module
detected is too old.

6 years agoMerge pull request #4548 from akallabeth/autoreconnect_fix
David Fort [Fri, 27 Apr 2018 07:39:30 +0000 (09:39 +0200)]
Merge pull request #4548 from akallabeth/autoreconnect_fix

Autoreconnect fix

6 years agoMerge pull request #4589 from oshogbo/token
David Fort [Thu, 26 Apr 2018 09:59:15 +0000 (11:59 +0200)]
Merge pull request #4589 from oshogbo/token

Recognize only the cookie format anything else treat as token.

6 years agoFix Windows build.
p-pautov [Thu, 26 Apr 2018 09:11:04 +0000 (02:11 -0700)]
Fix Windows build.

6 years agoFallback to RDG RPC transport only if server does not support RDG HTTP and
Pavel Pautov [Wed, 18 Apr 2018 00:05:20 +0000 (17:05 -0700)]
Fallback to RDG RPC transport only if server does not support RDG HTTP and
error out in other cases - invalid RDG SSL cert, bad credentials, PAA failue, etc.

6 years agoRemove some unused functions.
Pavel Pautov [Mon, 16 Apr 2018 21:23:13 +0000 (14:23 -0700)]
Remove some unused functions.

6 years agoApply "authentication level" RDP property only to non-RDG connections (as mstsc does).
Pavel Pautov [Thu, 12 Apr 2018 20:05:04 +0000 (13:05 -0700)]
Apply "authentication level" RDP property only to non-RDG connections (as mstsc does).

6 years agoDon't use CertificateName setting for RDG connections.
Pavel Pautov [Thu, 12 Apr 2018 03:02:44 +0000 (20:02 -0700)]
Don't use CertificateName setting for RDG connections.

6 years agoMerge pull request #4586 from Awingu/cbytes-fix
akallabeth [Wed, 25 Apr 2018 07:00:52 +0000 (09:00 +0200)]
Merge pull request #4586 from Awingu/cbytes-fix

Fix inconsistent cchReaderLen value between WinScard and pcsc-lite.

6 years agoMerge pull request #4588 from oshogbo/tokencookie
akallabeth [Wed, 25 Apr 2018 06:54:59 +0000 (08:54 +0200)]
Merge pull request #4588 from oshogbo/tokencookie

Fix comments where is cookie and where is token.

6 years agoFail on unimplemented BIO_ctrl for /gt:rpc
Christian Plattner [Tue, 24 Apr 2018 18:45:52 +0000 (20:45 +0200)]
Fail on unimplemented BIO_ctrl for /gt:rpc

6 years agoImplement BIO_ctrl more correctly for RDG
Christian Plattner [Tue, 24 Apr 2018 14:35:04 +0000 (16:35 +0200)]
Implement BIO_ctrl more correctly for RDG

See #3602

This change is discussed in https://github.com/FreeRDP/FreeRDP/pull/4576#pullrequestreview-113381733

6 years agoRevert useless part of the bugfix
Christian Plattner [Tue, 24 Apr 2018 14:20:42 +0000 (16:20 +0200)]
Revert useless part of the bugfix

This reverts commit 589d2ec62a6efc3af18b628c5f545c73c90dd331.

https://github.com/FreeRDP/FreeRDP/pull/4576#pullrequestreview-113378805

6 years agoRecognize only the cookie format anything else treat as token.
Mariusz Zaborski [Tue, 24 Apr 2018 13:00:00 +0000 (15:00 +0200)]
Recognize only the cookie format anything else treat as token.

If in the RDP file we will set loadbalanceinfo.
Instead of getting the cookie value we will get load balance info.

For example:
0000 03 00 00 2a 25 e0 00 00 00 00 00 74 73 76 3a 2f ...*%......tsv:/
0010 2f 56 4d 52 65 73 6f 75 72 63 65 2e 31 2e 41 48 /VMResource.1.AH
0020 0d 0a 01 00 08 00 0b 00 00 00                   ..........

The MSFT-SDLBTS document don't describe this behavior.

For this reason lets treat the token as anything ended with seqance
CR and CL. To be honest we already did that because in the core/connection.c
file where we are seting the routing_token to the LoadBalanceInfo.

6 years agoFix comments where is cookie and where is token.
Mariusz Zaborski [Tue, 24 Apr 2018 12:34:45 +0000 (14:34 +0200)]
Fix comments where is cookie and where is token.

6 years agoFix inconsistent cBytes value between WinScard and pcsc-lite.
Ruben De Visscher [Tue, 24 Apr 2018 08:33:44 +0000 (10:33 +0200)]
Fix inconsistent cBytes value between WinScard and pcsc-lite.

6 years agoSOCKS proxy support
Jiri Sasek [Fri, 18 Aug 2017 17:17:17 +0000 (19:17 +0200)]
SOCKS proxy support