Commit Graph

6389 Commits

Author SHA1 Message Date
Marc-André Moreau
ae368549ad freerdp: fix compilation on Windows 2014-05-22 14:42:05 -04:00
Marc-André Moreau
af4a413287 Merge branch 'non_blocking_writes' of github.com:hardening/FreeRDP into non_blocking_writes 2014-05-22 14:01:44 -04:00
Marc-André Moreau
146305f9b2 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-05-22 13:59:25 -04:00
Marc-André Moreau
ad4d8d2c59 Merge pull request #1857 from FreeRDP/mh-makecertfix
fixed missing extern C for cpp in makecert.h
2014-05-22 13:58:59 -04:00
Marc-André Moreau
247beff1b3 winpr: fix test compilation on Windows 2014-05-22 13:50:01 -04:00
Martin Haimberger
535d7668a7 fixed missing extern C for cpp in makecert.h 2014-05-22 01:28:01 -07:00
Hardening
3200baca4b Correctly export ringbuffer function and fix a warning 2014-05-21 22:20:38 +02:00
Hardening
2b1a27b9b6 Add .gitignore files for test generated files 2014-05-21 22:18:38 +02:00
Hardening
5c9a6408cf Fixed invalid declaration and missing argument 2014-05-21 19:13:40 +02:00
Hardening
de1c08736f Fix ringbuffer_write() to use const BYTE * instead of const void * 2014-05-21 19:12:51 +02:00
Hardening
d8eb1f284f Updated license headers 2014-05-21 18:44:49 +02:00
Hardening
a04843bc9e Fix some corner cases in ringbuffer and make unitary test have no leak 2014-05-21 18:32:59 +02:00
Hardening
5234e05843 Make ringbuffer C89 aware for VC 2014-05-21 18:17:39 +02:00
Hardening
dd6d829550 Allow transport_write calls to be non-blocking
This big patch allows to have non-blocking writes. To achieve
this, it slightly changes the way transport is handled. The misc transport
layers are handled with OpenSSL BIOs. In the chain we insert a
bufferedBIO that will bufferize write calls that couldn't be honored.

For an access with Tls security the BIO chain would look like this:
  FreeRdp Code ===> SSL bio ===> buffered BIO ===> socket BIO

The buffered BIO will store bytes that couldn't be send because of
blocking write calls.

This patch also rework TSG so that it would look like this in the
case of SSL security with TSG:
                                         (TSG in)
                              > SSL BIO => buffered BIO ==> socket BIO
                             /
FreeRdp => SSL BIO => TSG BIO
                             \
                              > SSL BIO => buffered BIO ==> socket BIO
                                        (TSG out)

So from the FreeRDP point of view sending something is only BIO_writing
on the frontBio (last BIO on the left).
2014-05-21 17:42:31 +02:00
Hardening
0376dcd065 Fix OOM situation 2014-05-21 17:27:36 +02:00
Hardening
9c18ae5bee Print function name when emiting an error 2014-05-21 17:27:36 +02:00
Hardening
0ea1dc43ec Add a ringbuffer implementation targetting byte sending
This adds a ringbuffer implementation that targets bytes sending.
The ringbuffer can grow when there's not enough room, that's why it's
not thread-safe (locking must be done externally). It will be shrinked
to its initial size as soon as the used bytes are the half of the
initial size.
2014-05-21 17:27:36 +02:00
Marc-André Moreau
4bac8374de Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-05-21 11:17:58 -04:00
Marc-André Moreau
94a836078f Merge pull request #1854 from zhangzl2013/floatbar
wfreerdp-floatbar: fix bug in non-fullscreen mode.
2014-05-21 11:02:16 -04:00
Marc-André Moreau
422a279682 Merge pull request #1853 from zhangzl2013/async
wfreerdp: add async input, update, transport and channels' events
2014-05-21 11:01:53 -04:00
Marc-André Moreau
7113cf2858 Merge pull request #1852 from orosam/auth3fix
Fix misplaced sec_trailer in rpc_auth_3 PDU
2014-05-21 11:01:12 -04:00
Marc-André Moreau
04dc037666 Merge pull request #1845 from SBoyNumber1/DiskDrives
Removed autosharing of all disk drives during redirect of any drive.
2014-05-21 10:57:27 -04:00
Marc-André Moreau
6f8fda247b Merge pull request #1844 from caramorsimon/tokenrouting
Test for CRLF (0x0D0A) termination on the routing token
2014-05-21 10:56:56 -04:00
Marc-André Moreau
472c231876 Merge pull request #1826 from Hobby-Student/master
fix FreeBSD compile errors
2014-05-21 10:53:47 -04:00
Bernhard Miklautz
92f74d15e8 Merge pull request #1762 from zhangzl2013/wfreerdp
wfreerdp: fix incorrect line color.
2014-05-21 11:21:02 +02:00
Zhang Zhaolong
5415577bde wfreerdp-floatbar: fix bug in non-fullscreen mode. 2014-05-21 16:13:55 +08:00
Zhang Zhaolong
4fc7a3c9ad wfreerdp: add async input, update, transport and channels' events handling. 2014-05-21 14:52:57 +08:00
Hardening
86489f1c9a Merge pull request #1629 from bmiklautz/update_pull_1609
Android jpeg build enhancement
2014-05-20 22:10:17 +02:00
Sandor Oroszi
d447f122c3 libfreerdp-core: fix misplaced sec_trailer in rpc_auth_3 PDU 2014-05-20 17:15:26 +02:00
Hardening
5aa5dd4609 Merge pull request #1430 from sukhodolin/Fixes
Fix debug output on Win32
2014-05-20 15:14:22 +02:00
Hardening
c0087832ad Merge pull request #1839 from hardening/base64
Changes for base64
2014-05-20 11:17:47 +02:00
Bernhard Miklautz
29710ae74a Merge pull request #1840 from hardening/valgrind
Adds some support for valgrind helpers
2014-05-19 16:23:06 +02:00
caramorsimon
8e77192ed8 Test for RoutingTokenLength before checking against termination chars 2014-05-18 21:32:26 +01:00
SBoyNumber1
4865cbd589 Removed autosharing of all disk drives during redirect of any drive. 2014-05-17 23:05:21 +03:00
caramorsimon
a561e246e8 Test for CRLF (0x0D0A) termination on the routing token before trying to add it again 2014-05-16 16:19:22 +01:00
Marc-André Moreau
37b0d634ed freerdp: fix C++ flags for FREERDP_EXPORTS, WINPR_EXPORTS 2014-05-12 19:09:00 -04:00
Marc-André Moreau
003870157a libwinpr-smartcard: remove some locks 2014-05-12 17:28:35 -04:00
Marc-André Moreau
bc771ec56b channels/smartcard: reuse the same thread for the same SCARDCONTEXT 2014-05-12 17:05:20 -04:00
Marc-André Moreau
9f70629c3a channels/smartcard: store SCARDCONTEXT, SCARDHANDLE in SMARTCARD_OPERATION 2014-05-12 16:45:24 -04:00
Marc-André Moreau
9f93565811 channels/smartcard: modify operation functions to take SMARTCARD_OPERATION* 2014-05-12 16:19:44 -04:00
Marc-André Moreau
d8053b3d93 channels/smartcard: cleanup smartcard operations 2014-05-12 15:47:49 -04:00
Marc-André Moreau
5416ab1d6e channels/smartcard: decode and then call 2014-05-12 15:32:02 -04:00
Marc-André Moreau
77827bb411 channels/smartcard: split encoding from calling 2014-05-12 15:22:57 -04:00
Marc-André Moreau
526e74f7fa channels/smartcard: further split decoding from calling 2014-05-12 15:04:31 -04:00
Marc-André Moreau
8a940ad778 channels/smartcard: start splitting decoding from calling 2014-05-12 14:13:57 -04:00
Hardening
729c24cedb Adds some support for valgrind helpers
This patch adds an option to compile freerdp in a valgrind compliant way.
The purpose is to ease memchecking when connecting with TLS. We mark bytes
retrieved from SSL_read() as plainly defined to prevent the undefined contamination.
With the patch and the option activated you get a single warning at connection
during the handshake, and nothing after.
2014-05-12 18:01:29 +02:00
Marc-André Moreau
fc39f6bc8d channels/smartcard: create smartcard context data structures with associated thread 2014-05-12 11:28:20 -04:00
Marc-André Moreau
2da6111972 channels/smartcard: fix clearing of rgSCardContextList 2014-05-12 10:17:49 -04:00
Hardening
9f1d0201ec Changes for base64
This patch changes the prototype for decode_base64 so that the encode / decode
method are consistant (encode(BYTE *) => char* and decode(char*) => BYTE*).
It also does some improvements with unrolling loops so that end conditions are
tested only at the end.
The patch also adds some unitary tests.
Before the patch base64_decode() made valgrind complain about uninitialized
bits, after valgrind is happy and very quiet.
2014-05-11 22:49:10 +02:00
Marc-André Moreau
ae6c778eb7 libwinpr-smartcard: modifying threading 2014-05-11 05:23:30 -04:00