Martin Fleisz [Wed, 22 Nov 2017 11:23:04 +0000 (12:23 +0100)]
Merge pull request #4244 from akallabeth/drivestoredirect
Fix parsing of drivestoredirect (#3267)
Martin Fleisz [Wed, 22 Nov 2017 11:06:55 +0000 (12:06 +0100)]
Merge pull request #4258 from akallabeth/kbd_parse_fix
Fix #4257: Proper error checks for /kbd argument
Armin Novak [Tue, 21 Nov 2017 07:46:29 +0000 (08:46 +0100)]
Fix #4257: Proper error checks for /kbd argument
Martin Fleisz [Wed, 22 Nov 2017 08:24:16 +0000 (09:24 +0100)]
Merge pull request #4263 from akallabeth/rdp_parser_mem_corruption_fix
Fixed #4249: Corruption due to recursive parser
akallabeth [Tue, 21 Nov 2017 18:10:28 +0000 (19:10 +0100)]
Testing argument to end with file extension.
Martin Fleisz [Tue, 21 Nov 2017 16:25:25 +0000 (17:25 +0100)]
Merge pull request #4264 from cedrozor/upstream-master
Fixed NLA for Negotiate and NTLM authentication
cedrozor [Tue, 21 Nov 2017 15:36:47 +0000 (16:36 +0100)]
Fixed NLA for Negotiate and NTLM authentication (regression due to the recent addition of kerberos support)
Armin Novak [Tue, 21 Nov 2017 12:47:28 +0000 (13:47 +0100)]
Fixed #4249: Corruption due to recursive parser
Martin Fleisz [Tue, 21 Nov 2017 10:02:25 +0000 (11:02 +0100)]
Merge pull request #4252 from akallabeth/mac_kbd_sync
Mac kbd sync
Martin Fleisz [Tue, 21 Nov 2017 09:55:18 +0000 (10:55 +0100)]
Merge pull request #4256 from akallabeth/15bpp_fix
Fix #4111: 15bpp color handling for brush.
Armin Novak [Fri, 17 Nov 2017 13:03:57 +0000 (14:03 +0100)]
Fix parsing of drivestoredirect (#3267)
Bernhard Miklautz [Mon, 20 Nov 2017 15:30:54 +0000 (16:30 +0100)]
Merge pull request #4254 from akallabeth/doc_update
Fix #3509: Added Ctrl+Alt+Enter description
Armin Novak [Mon, 20 Nov 2017 14:00:09 +0000 (15:00 +0100)]
Fix #4111: 15bpp color handling for brush.
Bernhard Miklautz [Mon, 20 Nov 2017 13:11:15 +0000 (14:11 +0100)]
Merge pull request #4253 from akallabeth/win_return
Win return code
Armin Novak [Mon, 20 Nov 2017 12:21:50 +0000 (13:21 +0100)]
Fix #3509: Added Ctrl+Alt+Enter description
Armin Novak [Mon, 20 Nov 2017 12:16:49 +0000 (13:16 +0100)]
Fix #3211: Return freerdp error from main.
Armin Novak [Mon, 20 Nov 2017 10:46:32 +0000 (11:46 +0100)]
Fixed keyboard state sync.
Armin Novak [Mon, 20 Nov 2017 10:46:09 +0000 (11:46 +0100)]
Removed linux specific include.
David Fort [Fri, 17 Nov 2017 14:23:24 +0000 (15:23 +0100)]
Merge pull request #4243 from akallabeth/man_fix
Better description for drive redirection (Fix #3513)
Armin Novak [Fri, 17 Nov 2017 12:44:56 +0000 (13:44 +0100)]
Better description for drive redirection (Fix #3513)
akallabeth [Fri, 17 Nov 2017 12:31:43 +0000 (13:31 +0100)]
Merge pull request #3904 from bjcollins/master
FIPS Mode support for xfreerdp
Martin Fleisz [Fri, 17 Nov 2017 12:02:46 +0000 (13:02 +0100)]
Merge pull request #4236 from akallabeth/scan_fix_remastered
Scanbuild warning fixes
Armin Novak [Fri, 17 Nov 2017 11:41:18 +0000 (12:41 +0100)]
Fixed formatting.
Brent Collins [Wed, 12 Apr 2017 19:03:20 +0000 (14:03 -0500)]
Make the new winpr_Digest*MD5_Allow_FIPS functions more generic to no longer be MD5 specific in design. This way the FIPS override
could easily be extended to more digests in the future. For now, an attempt to use these functions with anything other than MD5 will
not work.
Brent Collins [Tue, 11 Apr 2017 17:04:25 +0000 (12:04 -0500)]
Initialize SSL directly in the sample server, instead of relying on the SSL initialize logic
in the tls code as it was removed in a previous patch due to its redundancy.
Brent Collins [Tue, 11 Apr 2017 17:02:17 +0000 (12:02 -0500)]
Fix checks for openssl version numbers around fips changes, they were using an incorrect version matching 1.1.0 and not 1.0.1
Simplify the logic to enable openssl fips mode
Brent Collins [Tue, 11 Apr 2017 16:57:39 +0000 (11:57 -0500)]
Do not initialize SSL in freerdp_context_new, it is too early to detect the fips enabled flag
and is redundant since it is initialized later before actually using SSL.
Brent Collins [Mon, 10 Apr 2017 19:20:50 +0000 (14:20 -0500)]
Fix the return values of the winpr_Digest_Init functions which were accidentally removed
during rework in previous checkin.
Brent Collins [Mon, 10 Apr 2017 19:19:43 +0000 (14:19 -0500)]
Move the disabling nla and setting the fips encryption mode based on fips
mode to happen after argument parsing to ensure it always enforced.
Brent Collins [Mon, 10 Apr 2017 19:03:39 +0000 (14:03 -0500)]
Fix logic error in reworked MD5 call for establishing keys, and fix some minor whitespace issues.
Brent Collins [Mon, 10 Apr 2017 18:33:37 +0000 (13:33 -0500)]
Fix variable definition placement to adhere to older C standard.
Brent Collins [Mon, 10 Apr 2017 18:19:59 +0000 (13:19 -0500)]
FIPS_mode() and FIPS_mode_set() does not exist in OpenSSL versions before 1.0.1
Brent Collins [Mon, 10 Apr 2017 18:06:04 +0000 (13:06 -0500)]
Change initialization of EVP_CIPHER_CTX to use API function instead of trying to calloc().
Fix some warnings noted from build output.
Brent Collins [Mon, 10 Apr 2017 16:08:40 +0000 (11:08 -0500)]
Workaround for missing EVP_CIPH_FLAG_FIPS_NON_ALLOW flag in openssl 1.0.0.
Brent Collins [Fri, 7 Apr 2017 21:54:08 +0000 (16:54 -0500)]
Add new command-line option to force xfreerdp into a fips compliant mode.
This option will ensure that NLA is disabled(since NTLM uses weak crypto algorithms), FIPS
encryption is enabled, and ensure fips mode is enabled for openssl.
Selectively override specific uses of MD5/RC4 with new API calls specifically tailored to override FIPS.
Add comments on why overriding the use of these algorithms under FIPS is acceptable for the locations where overrides happen.
Remove check of server proprietary certificate which was already being ignore to avoid use of MD5.
Initialize winpr openssl earlier to ensure fips mode is set before starting using any crypto algorithms.
David Fort [Fri, 17 Nov 2017 08:36:50 +0000 (09:36 +0100)]
Merge pull request #4242 from ccpp/afreerdp_versioncode_11
Increase APK versionCode for aFreeRDP 2.0-rc1
Christian Plattner [Fri, 17 Nov 2017 07:58:07 +0000 (08:58 +0100)]
Increase versionCode for aFreeRDP 2.0-rc1
David Fort [Thu, 16 Nov 2017 14:26:03 +0000 (15:26 +0100)]
Merge pull request #4186 from RangeeGmbH/multimonitor_primary_fix
FreeRDP multimonitor: Use first command line element, then primary, …
David Fort [Thu, 16 Nov 2017 12:26:01 +0000 (13:26 +0100)]
Merge pull request #4000 from akallabeth/ign_keyword_fix
Command line ignore empty if flag set
akallabeth [Thu, 16 Nov 2017 11:07:07 +0000 (12:07 +0100)]
Merge pull request #4034 from blino/wayland-keymap
Reuse evdev/X11 keymap for wayland
Martin Fleisz [Thu, 16 Nov 2017 08:39:04 +0000 (09:39 +0100)]
Merge pull request #4237 from akallabeth/remove_atoi
Replaced atoi
Armin Novak [Tue, 14 Nov 2017 10:22:07 +0000 (11:22 +0100)]
Fixed resource cleanup.
Armin Novak [Tue, 14 Nov 2017 13:02:53 +0000 (14:02 +0100)]
Fixed formatting.
Armin Novak [Tue, 14 Nov 2017 13:01:46 +0000 (14:01 +0100)]
Fixed leaks and formatting.
Armin Novak [Tue, 14 Nov 2017 13:00:32 +0000 (14:00 +0100)]
Fixed color for drawing rectangles.
Armin Novak [Tue, 14 Nov 2017 12:59:15 +0000 (13:59 +0100)]
Fixed missing function return check.
Armin Novak [Tue, 14 Nov 2017 12:58:55 +0000 (13:58 +0100)]
Fixed missing parameter checks.
Armin Novak [Tue, 14 Nov 2017 12:58:31 +0000 (13:58 +0100)]
Fixed uninitialized variables.
Armin Novak [Tue, 14 Nov 2017 12:58:08 +0000 (13:58 +0100)]
Fixed missing error check.
Armin Novak [Tue, 14 Nov 2017 12:57:48 +0000 (13:57 +0100)]
Fixed uninitialized arguments.
Armin Novak [Tue, 14 Nov 2017 12:57:00 +0000 (13:57 +0100)]
Fixed warnings and formatting.
Armin Novak [Tue, 14 Nov 2017 12:56:19 +0000 (13:56 +0100)]
Functions static, warnings fixed.
Armin Novak [Tue, 14 Nov 2017 12:55:58 +0000 (13:55 +0100)]
Fixed formatting and warnings.
Armin Novak [Tue, 14 Nov 2017 12:55:24 +0000 (13:55 +0100)]
Fixed dead store warning.
Armin Novak [Tue, 14 Nov 2017 12:54:59 +0000 (13:54 +0100)]
Removed unused argument.
Armin Novak [Tue, 14 Nov 2017 12:54:26 +0000 (13:54 +0100)]
Fixed missing function return check.
Armin Novak [Tue, 14 Nov 2017 12:54:05 +0000 (13:54 +0100)]
Fixed multiple warnings in parser
Armin Novak [Tue, 14 Nov 2017 12:52:52 +0000 (13:52 +0100)]
Fixed compile warnings.
Armin Novak [Tue, 14 Nov 2017 12:52:19 +0000 (13:52 +0100)]
Fixed warnings and test return values.
Armin Novak [Tue, 14 Nov 2017 12:51:37 +0000 (13:51 +0100)]
Fixed NULL arguments and compile warnings.
Armin Novak [Tue, 14 Nov 2017 12:50:30 +0000 (13:50 +0100)]
Fixed dead store.
Armin Novak [Tue, 14 Nov 2017 15:10:52 +0000 (16:10 +0100)]
Replaced atoi
David Fort [Wed, 15 Nov 2017 14:47:35 +0000 (15:47 +0100)]
Merge pull request #3940 from akallabeth/custom_help_arguments
Added a new function to allow printing help with additional arguments.
David Fort [Wed, 15 Nov 2017 14:37:27 +0000 (15:37 +0100)]
Merge pull request #4235 from akallabeth/avcodec_encode_video_fix
Added encoder path for libavcodec versions <1.0
Armin Novak [Thu, 4 May 2017 12:46:58 +0000 (14:46 +0200)]
Allow printing of custom arguments in help.
Armin Novak [Tue, 14 Nov 2017 08:15:43 +0000 (09:15 +0100)]
Added encoder path for libavcodec versions <1.0
David Fort [Mon, 13 Nov 2017 16:39:27 +0000 (17:39 +0100)]
Merge pull request #4233 from akallabeth/kerberos_rebased
Kerberos rebased
David Fort [Mon, 13 Nov 2017 16:09:48 +0000 (17:09 +0100)]
Merge pull request #4232 from akallabeth/ffmpeg_compat
Added compat define for missing format.
David Fort [Mon, 13 Nov 2017 14:50:28 +0000 (15:50 +0100)]
Fix logic in nla_read_ts_credentials
Armin Novak [Tue, 18 Jul 2017 09:38:59 +0000 (11:38 +0200)]
Fixed uninitialized values and leaks.
dodo040 [Fri, 18 Aug 2017 17:18:02 +0000 (19:18 +0200)]
fix Kerberos flavour's detection (MIT/Heimdal) and double free for MIT<1.13
dodo040 [Thu, 27 Jul 2017 15:02:06 +0000 (17:02 +0200)]
fix typo
dodo040 [Wed, 12 Jul 2017 09:59:39 +0000 (11:59 +0200)]
fix undeclared identifier on Windows
dodo040 [Tue, 11 Jul 2017 15:32:28 +0000 (17:32 +0200)]
use SSIZE_T instead of ssize_t
dodo040 [Tue, 11 Jul 2017 09:30:44 +0000 (11:30 +0200)]
handle missing ssize_t on Windows
dodo040 [Mon, 10 Jul 2017 14:51:41 +0000 (16:51 +0200)]
remove useless includes
dodo040 [Mon, 3 Jul 2017 10:47:56 +0000 (12:47 +0200)]
fix: GSS API init, enterprise name management, variable names and format code
dodo040 [Wed, 17 May 2017 09:36:36 +0000 (11:36 +0200)]
fix undefined symbol references at linking stage
dodo040 [Thu, 11 May 2017 16:51:45 +0000 (18:51 +0200)]
initial commit for kerberos support
Armin Novak [Mon, 13 Nov 2017 10:28:43 +0000 (11:28 +0100)]
Added compat define for missing format.
akallabeth [Mon, 13 Nov 2017 09:01:01 +0000 (10:01 +0100)]
Merge pull request #4122 from ben-cohen/sshagent
Forward ssh-agent data between ssh-agent and RDP
David Fort [Mon, 13 Nov 2017 08:30:28 +0000 (09:30 +0100)]
Merge pull request #4212 from SriRamanujam/ffmpeg_encoder_fixes
Fix libavcodec encoding errors and set tunables.
Sri Ramanujam [Sun, 12 Nov 2017 22:31:22 +0000 (17:31 -0500)]
Fallback #ifdefs for older versions of libavcodec
Ben Cohen [Fri, 10 Nov 2017 20:09:49 +0000 (20:09 +0000)]
Remove underscores from define in sshagent_main.h
Ben Cohen [Thu, 9 Nov 2017 21:45:12 +0000 (21:45 +0000)]
Fix comments at the start of these files and adjust copyrights
Ben Cohen [Fri, 8 Sep 2017 19:05:06 +0000 (20:05 +0100)]
Add server side plugin [UNTESTED]
This is based on xrdpapi/xrdp-ssh-agent.c from xrdp PR #867.
Ben Cohen [Fri, 8 Sep 2017 17:00:34 +0000 (18:00 +0100)]
Add rdpcontext so read thread can report channel error
Also fix copyright dates...
Ben Cohen [Fri, 8 Sep 2017 16:09:50 +0000 (17:09 +0100)]
Remove EAGAIN/EWOULDBLOCK from blocking read/write
Ben Cohen [Fri, 8 Sep 2017 15:52:14 +0000 (16:52 +0100)]
Fix socket fd leak and other changes
1. In connect_to_sshagent() if connect() fails, the socket agent_fd is
leaked. It needs to be closed before returning.
2. Fix copyright messages.
3. Make if statement with call to CreateThread() clearer to read.
Ben Cohen [Mon, 26 Jun 2017 20:16:22 +0000 (21:16 +0100)]
Forward ssh-agent data between ssh-agent and RDP
Add the sshagent plugin to forward the ssh-agent protocol over an RDP
dynamic virtual channel, just as the normal ssh-agent forwards it over
an SSH channel. Add the "/ssh-agent" command line option to enable it.
Usage:
Run FreeRDP with the ssh-agent plugin enabled:
xfreerdp /ssh-agent ...
In the remote desktop session run xrdp-ssh-agent and evaluate the output
in the shell as for ssh-agent to set the required environment variables
(specifically $SSH_AUTH_SOCK):
eval "$(xrdp-ssh-agent -s)"
This is the same as for the normal ssh-agent. You would typically do
this in your Xsession or /etc/xrdp/startwm.sh.
Limitations:
1. Error checking and handling could be improved.
2. This is only tested on Linux and will only work on systems where
clients talk to the ssh-agent via Unix domain sockets. It won't
currently work on Windows but it could be ported.
akallabeth [Fri, 10 Nov 2017 08:32:39 +0000 (09:32 +0100)]
Merge pull request #4225 from krisztian-kovacs-balabit/use-redirection-pdu-password-on-reconnect
core/connection: use redirection password when reconnecting
David Fort [Thu, 9 Nov 2017 17:11:12 +0000 (18:11 +0100)]
Merge pull request #4226 from krisztian-kovacs-balabit/open-x509-keyfile-readonly
libfreerdp/core/certificate: open key file for reading only
Sri Ramanujam [Fri, 18 Aug 2017 17:19:44 +0000 (13:19 -0400)]
Fix libavcodec encoding errors and set tunables.
KOVACS Krisztian [Thu, 28 Sep 2017 12:00:18 +0000 (14:00 +0200)]
libfreerdp/core/certificate: open key file for reading only
There's no point in writing the key file for read-write, and it makes it
impossible to run the shadow server with the key file being read only.
Martin Fleisz [Thu, 9 Nov 2017 15:24:46 +0000 (16:24 +0100)]
Merge pull request #4224 from krisztian-kovacs-balabit/nsc-memory-corruption-fix
codec/nsc: fix memory corruption in case of chroma subsampling
David Fort [Thu, 9 Nov 2017 14:26:06 +0000 (15:26 +0100)]
Merge pull request #4163 from rjcorrig/tzscripts
winpr: Convert time zone generator programs to C# scripts
David Fort [Thu, 9 Nov 2017 14:24:27 +0000 (15:24 +0100)]
Merge pull request #4151 from ondrejholy/manpages-update-master
Manpage and /help update
KOVACS Krisztian [Tue, 7 Nov 2017 15:06:01 +0000 (16:06 +0100)]
core/connection: use redirection password when reconnecting
According to MS-RDPBCGR the server might send a password in the Redirection PDU
that then must be sent by the client to the server as password.
Since the field either contains a password string (unicode) or a binary cookie,
we try to convert the password from unicode and use it only if conversion
succeeds.
KOVACS Krisztian [Tue, 7 Nov 2017 12:52:09 +0000 (13:52 +0100)]
codec/nsc: fix memory corruption in case of chroma subsampling
For odd number of rows, the memory copy operation was broken: after exiting
the loop, yplane points to the end of the last row data, and thus (yplane +
rw) points *after* the end of the last row.
David Fort [Thu, 9 Nov 2017 12:35:56 +0000 (13:35 +0100)]
Merge pull request #4223 from akallabeth/mac_client_crash_fix
Added missing pointer callback.