Commit Graph

6878 Commits

Author SHA1 Message Date
Bernhard Miklautz
18ead81b47 Merge pull request #1970 from dbungert/cipher
Add arguments for managing tls ciphers & netmon
2014-07-18 11:14:18 +02:00
Marc-André Moreau
128a21a273 Merge pull request #1971 from awakecoding/master
Win32 Visual Studio Version + Toolset Fixes, makecert improvements
2014-07-17 17:46:15 -04:00
Marc-André Moreau
19c25cf2b4 winpr-pool: fix header on non-Windows 2014-07-17 17:34:51 -04:00
Marc-André Moreau
7b80187cdc Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-07-17 17:30:36 -04:00
Marc-André Moreau
a23d5ea527 winpr/makecert: improve command line options 2014-07-17 16:47:29 -04:00
Marc-André Moreau
e6f4754ed3 winpr: improve windows builds across visual studio versions and toolsets 2014-07-17 15:11:04 -04:00
Marc-André Moreau
4f4603133e winpr: fix build on Windows with unit tests 2014-07-17 12:02:47 -04:00
Daniel Bungert
625f7c3c22 Add arguments for managing tls ciphers & netmon
This adds 2 arguments:
    /tls-ciphers                List of permitted openssl ciphers - see ciphers(1)
    /tls-ciphers-netmon         Use tls ciphers that netmon can parse

With KB2919355, client/server negotiate the use of
TLS cipher TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
which works fine except that netmon can't parse it.
By adding commandline /tls-ciphers-netmon, we restrict
the available ciphers to a list that netmon can
deal with.  Also adds /tls-ciphers, which
accepts a string arg, for further customization.
2014-07-17 06:59:06 -06:00
Marc-André Moreau
0fb3bf1dfd winpr/tools/makecert: add pfx support 2014-07-16 17:13:02 -04:00
Bernhard Miklautz
c4c8a3fca7 Merge pull request #1967 from nfedera/fix-2014-07-16-01
core: addd missing PlaySound server callback
2014-07-16 16:17:20 +02:00
Norbert Federa
8482eed323 core: addd missing PlaySound server callback 2014-07-16 15:38:10 +02:00
Bernhard Miklautz
caeea1cbcd Merge pull request #1961 from g-reno/master
android toolchain and CMakeLists.txt update
2014-07-16 11:26:00 +02:00
Vic Lee
0ba59c842d echo: add server echo channel api. 2014-07-15 11:42:12 +08:00
Vic Lee
8df60ecbe4 tls: fix some error handling. 2014-07-15 11:36:35 +08:00
Gerry Reno
3bd1f4898d android CMakeLists.txt: added else clause to test for v7 appcompat 2014-07-14 08:53:20 -04:00
Vic Lee
29cb8680ce server: allow partial channel read (fix rdpsnd). 2014-07-14 20:00:38 +08:00
Gerry Reno
6ecb8131a4 android toolchain: add back setting of ANDROID_SDK 2014-07-14 07:58:32 -04:00
Bernhard Miklautz
f01daa8d06 Merge pull request #1960 from akallabeth/android-build-script-fix
Android build setup script fixes
2014-07-14 10:49:07 +02:00
Bernhard Miklautz
bf835c54d8 Merge pull request #1958 from akallabeth/android-bookmark-fix
Android bookmark fix
2014-07-14 10:47:40 +02:00
Gerry Reno
d06ed2fa2f android CMakeLists.txt: added support for both 'support' and 'compatibility' in support library path for v7 appcompat
supports path styles:
$ANDROID_SDK/extras/android/support/v7/appcompat
$ANDROID_SDK/extras/android/compatibility/v7/appcompat
2014-07-13 14:54:48 -04:00
Gerry Reno
9fa451428b cmake: android toolchain set ANDROID_DEFAULT_NDK_API_LEVEL 9 2014-07-13 08:40:58 -04:00
Gerry Reno
a640428905 cmake: android toolchain update to latest upstream
AndroidToolchain.cmake: updated from https://github.com/taka-no-me/android-cmake/raw/master/android.toolchain.cmake
2014-07-13 08:34:48 -04:00
Armin Novak
0e61cd296c * Fixed android setup script, if run as update. (git fetch instead of git pull)
* Checking return of openssl build now and inform about build errors.
2014-07-13 13:35:11 +02:00
Marc-André Moreau
4d3ea77972 Merge pull request #1917 from SBoyNumber1/BitmapCacheV3OnAndroid
Added detect of uncompressed data in CACHE_BITMAP_REV3_ORDER. According ...
2014-07-11 16:35:11 -04:00
Marc-André Moreau
61b35e2e8f Merge pull request #1948 from jbd1986/fix-french-canadian
I am making several changes to clean up French Canadian keyboard defs.
2014-07-11 16:34:43 -04:00
Armin Novak
ba296e5f92 Removed unused code. 2014-07-11 18:49:40 +02:00
Armin Novak
f00a3d95d9 Fixed wrong visibility setting of bookmark list view 2014-07-11 18:49:20 +02:00
Bernhard Miklautz
c99d4648ff Merge pull request #1950 from hardening/kill_select
kill the last remaining select() in libfreerdp
2014-07-11 16:41:31 +02:00
Norbert Federa
6b47229563 Merge pull request #1955 from nfedera/fix-2014-07-10-02
winpr: CloseHandle did not release the thread TCB
2014-07-11 16:35:12 +02:00
Bernhard Miklautz
39d78ba707 Merge pull request #1954 from nfedera/fix-2014-07-10-01
transport_read: ensure stream buf size >= pdu size
2014-07-11 15:08:10 +02:00
Bernhard Miklautz
97fec44eed Merge pull request #1823 from akallabeth/cmake-library-noversion
Build library without SOVERSION
2014-07-11 13:21:12 +02:00
Armin Novak
f05e872009 Now usin ON/OFF to set library versioning. 2014-07-11 13:07:36 +02:00
Armin Novak
ad3255354d Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
SOVERSION information. (required by Android)
2014-07-11 11:53:58 +02:00
Marc-André Moreau
71c380830c Merge pull request #1957 from hardening/ssl_deco_fix
Fix unclean SSL disconnection
2014-07-10 17:45:43 -04:00
Hardening
3fce288c66 Fix unclean SSL disconnection
This patch prevent an infinite loop when the remote peer disconnect
the socket without cleanly closing the SSL connection.
2014-07-10 23:35:11 +02:00
Marc-André Moreau
1a192f552b Merge pull request #1956 from bmiklautz/feat/monolithic
monolithic winpr
2014-07-10 17:02:43 -04:00
Bernhard Miklautz
7b450f4012 winpr: fix handling of absolute include paths
Don't prefix include paths if it is absolute
2014-07-10 17:40:27 +02:00
Norbert Federa
aac57e7e72 winpr: CloseHandle did not release the thread TCB
This resulted in huge memory leaks - 8MB per thread, depending on
the system's default stack size.
The leak happend even if CloseHandle() was correctly used to "detach"
the thread but WaitForSingleObject was never called.
2014-07-10 12:28:35 +02:00
Norbert Federa
c206a35c12 transport_read: ensure stream buf size >= pdu size
Without this check a simple nc < /dev/urandom server:3389 could
kill the server instantly.
2014-07-10 12:09:48 +02:00
Bernhard Miklautz
6a49bcfe40 winpr: always build "monolitic"
winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.

The only exception is winpr-makecert-tool which is still build as extra
library.

This obsoletes complex_libraries for winpr.
2014-07-10 11:10:58 +02:00
Marc-André Moreau
1d8e2fc95f Merge pull request #1953 from awakecoding/master
Fix _aligned_realloc() when resizing to smaller size
2014-07-09 20:26:03 -04:00
Marc-André Moreau
2e1f6b0c6d libwinpr-crt: fix realloc to smaller size 2014-07-09 20:10:33 -04:00
Justin DeFields
eeeaa1f4df Fixed typo and changed Canadian French (legacy) to 0x00000c0c which most online docs support. 2014-07-09 10:09:43 -04:00
Hardening
6223460557 kill the last remaining select() in libfreerdp 2014-07-09 11:28:41 +02:00
Justin DeFields
00b01f1b4e I am making several changes to cleanup French Canadian, with the end result being: ca,fr -> Canadian French ca,fr-legacy -> Canadian English ca,eng -> Canadian English. Currently ca,fr isn't defined, ca,fr-legacy thinks it's Canadian French and it isn't anyway because the value is wrong for that definition, and ca,eng is US. 2014-07-08 16:51:50 -04:00
Marc-André Moreau
17102fd42c Merge pull request #1947 from awakecoding/egfx
[MS-RDPEGFX] ClearCodec, H264, YCbCr
2014-07-08 16:12:03 -04:00
Marc-André Moreau
ee8c0906f0 libfreerdp-codec: fix strict aliasing warnings in ncrush code 2014-07-08 15:59:23 -04:00
Marc-André Moreau
c492017fa1 libfreerdp-codec: fix build bot warnings 2014-07-08 15:48:29 -04:00
Marc-André Moreau
ac7d23b9a3 libfreerdp-gdi: migrate to _aligned_malloc/_aligned_free 2014-07-08 15:07:19 -04:00
Marc-André Moreau
c16000e67b Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx 2014-07-08 12:29:30 -04:00