Commit Graph

260 Commits

Author SHA1 Message Date
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
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
Martin Haimberger
d9e2834a70 channel smartcard hardend 2015-07-09 03:00:19 -07:00
Martin Haimberger
6e4e1c2773 Merge remote-tracking branch 'upstream/master' into mh-stream-fix
Conflicts:
	client/Windows/wf_cliprdr.c
2015-06-18 03:06:40 -07:00
Martin Haimberger
76305a716c just satisfied compiler 2015-06-18 03:04:33 -07:00
David FORT
12f873f1f9 Fixed MessageQueue and callers 2015-05-29 14:24:14 +02:00
Bernhard Miklautz
d922afc24a smartcard: fix compiler warnings
gcc 4.7.2:
warning: passing argument 1 of ‘free’ discards ‘const’ qualifier from
pointer target type
2015-05-18 11:36:31 +02:00
Hardening
f8120919af Add checks for some XXX_New and XXX_Add functions
Based on PR #2616
2015-05-18 11:28:00 +02:00
Norbert Federa
1eff1a345e free can handle NULL perfectly fine 2015-05-11 09:07:39 +02:00
Marc-André Moreau
cb002d91cd channels/smartcard: fix pioRecvPci with cbExtraBytes > 0 2015-03-13 14:20:57 -04:00
Marc-André Moreau
bc50c81a0a channels/smartcard: fix SCardTransmit return encoding with pioRecvPci 2015-02-20 15:39:51 -05:00
Marc-André Moreau
5e53063d55 channels/smartcard: fix SCardTransmit pioRecvPci parsing 2015-01-31 12:27:48 -05:00
Marc-André Moreau
bcc702346f channels/smartcard: fix buffer read alignment in SCardTransmit parsing 2015-01-23 14:19:15 -05:00
Marc-André Moreau
f0fc27f7bd libwinpr-winscard: add WINPR_WINSCARD_LOCK_TRANSACTIONS environment variable, fix winpr_HexDump line feeds 2015-01-20 15:29:05 -05:00
Marc-André Moreau
ee51da8500 channels/smartcard: cleanup debug output 2015-01-20 11:16:37 -05:00
Marc-André Moreau
b057d1eaf7 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-01-20 09:29:21 -05:00
Armin Novak
ddd8a1da80 Prettiefied WLog messages. 2015-01-20 11:23:12 +01:00
Marc-André Moreau
e47f1c8b80 channels/smartcard: minor robustness fixes 2015-01-19 12:04:23 -05:00
Marc-André Moreau
51554ff16c channels: patch rdpdr/smartcard valgrind leaks, fix hang on disconnect 2014-12-28 14:56:13 -05:00
Marc-André Moreau
6c2ebb2b58 channels: redirection valgrind fixes 2014-12-27 13:50:50 -05:00
Marc-André Moreau
9ebc67ba02 channels/smartcard: cleanup SCardControl 2014-12-22 16:25:59 -05:00
Marc-André Moreau
0625be2720 channels/smartcard: fix SCardGetAttrib SCARD_AUTOALLOCATE support 2014-12-22 13:28:16 -05:00
Vinche
d7fe4d2803 Implementation for IOCTL_SCARD_LOCATECARDSBYATRA 2014-11-11 00:35:46 +01:00
Vinche
d427faf5c6 Cleaning Code 2014-11-10 23:51:34 +01:00
Vinche
53707c97c8 Comments 2014-11-10 23:48:55 +01:00
Vinche
fdb95c712b Implementation for Smartcard Reader with Pin Pad 2014-11-10 23:40:22 +01:00
Vinche
2708a8de5c first commit 2014-11-09 22:42:35 +01:00
Armin Novak
059374457d Removed library prefix override. 2014-09-17 11:27:11 +02:00
Armin Novak
b1e9ffb655 Using wlog for channel logging now.
Fixed compiler warnings and broken callback in urbdrc.
2014-09-15 08:48:46 +02:00
Bernhard Miklautz
0313ca3622 libfreerdp: always build "MONOLITHIC"
"libfreerdp" consisted of multiple (small) single libraries. If the cmake
option MONOLITHIC was used only one library was build combining all of
the libfreerdp-* libraries.
The only exceptions to this are libfreerdp-server and libfreerdp-client these
are build as separate libraries.

This commit obsoltes non-monolithic builds and makes monolithic builds
the default. The cmake option MONOLITHIC is also removed.
2014-09-12 00:19:53 +02:00
Armin Novak
b22b897389 Reformatted changed files. 2014-09-09 16:32:22 +02:00
Armin Novak
419f102bec Fixed calling of dump functions, new API 2014-09-09 16:31:46 +02:00
Armin Novak
66b8905ac6 Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
Armin Novak
b252009d36 Replaced custom logging mechanism with WLog wrapper. 2014-08-07 16:51:49 +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
erbth
0842475876 fixed getstatuschangeW rdp-return value in case of failure 2014-06-12 17:19:08 +02:00
erbth
19397d47fd fixed getstatuschangeA rdp-return value in case of failure 2014-06-11 21:45:53 +02:00
Marc-André Moreau
f5bfb98aca channels/smartcard: experiment with multiple card contexts 2014-06-02 17:20:01 -04:00
Marc-André Moreau
ba5d84ee5c libwinpr-smartcard: add logging for each calls in smartcard inspector 2014-05-26 17:54:39 -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
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
Marc-André Moreau
fda492c58d libwinpr-smartcard: fix AccessStartedEvent 2014-05-11 01:53:47 -04:00
Marc-André Moreau
d04430cb02 channels/smartcard: implement usage of SCardAccessStartedEvent 2014-05-10 23:43:25 -04:00
Marc-André Moreau
894ec8c4aa channels/smartcard: cleanup 2014-05-08 15:24:33 -04:00
Marc-André Moreau
81be8b2473 channels/smartcard: better selection of async vs sync processing of IRPs 2014-05-07 21:16:05 -04:00
Marc-André Moreau
67f691f90a channels/smartcard: add improve completed IRP management 2014-05-07 17:41:53 -04:00
Marc-André Moreau
d53a9415ae channels/smartcard: add sequence id to IRPs for easier cancellation 2014-05-06 18:19:54 -04:00
Marc-André Moreau
62395f7b0c channels/smartcard: add rgSCardContextList 2014-05-06 17:42:10 -04:00
Marc-André Moreau
22e2490df7 channels/smartcard: avoid crash on SCardStatusA failure 2014-05-06 11:25:19 -07:00
Marc-André Moreau
b3114ff4d8 channels/smartcard: improve debug output, fix GetStatusChange SCARD_E_CANCELLED, fix SCardGetAttrib current protocol type 2014-05-06 10:00:44 -07:00
Marc-André Moreau
9e407e6e22 libwinpr-smartcard: start handling SCardControl control code conversions 2014-05-03 19:02:17 -04:00
Marc-André Moreau
b51da6c6f4 libwinpr-smartcard: improve SCardGetAttrib, fix null SCARDCONTEXT usage in SCardListReaders 2014-05-03 17:07:30 -04:00
Marc-André Moreau
cd7e3151cd libwinpr-smartcard: fix PCSC incompatible type definitions 2014-05-03 13:49:50 -04:00
Marc-André Moreau
b1c0a68f55 client/common: honor RedirectSmartCards, RedirectPrinters 2014-04-27 21:29:44 -04:00
Marc-André Moreau
103b7d4151 libwinpr-smartcard: fix workaround for lack of PnP Notification support on OS X 2014-04-27 16:43:09 -04:00
Marc-André Moreau
6059ffbb88 channels/smartcard: harden unpacking code, don't modify GetStatusChange parameters 2014-04-27 15:45:36 -04:00
Marc-André Moreau
2728178211 channels/smartcard: fix SCardTransmit pioRecvPci 2014-04-16 15:24:56 -04:00
Marc-André Moreau
19b9ed3bb0 channels/smartcard: some Mac OS X fixes 2014-04-16 14:03:22 -04:00
Marc-André Moreau
38d05b48a0 channels/smartcard: fix reader name aliasing 2014-04-15 13:49:52 -04:00
Marc-André Moreau
62481e83ee channels/smartcard: add more debug output 2014-04-13 16:48:32 -04:00
Marc-André Moreau
d699128a57 channels/smartcard: add more debug output 2014-04-13 15:50:51 -04:00
Marc-André Moreau
5920dbc074 channels/smartcard: cleanup of sanitization 2014-04-12 15:09:23 -04:00
Marc-André Moreau
7ff1c984c2 channels/smartcard: add more debug output, make distinction between reader and card state 2014-04-12 14:31:54 -04:00
Marc-André Moreau
fd6052f348 channels/smartcard: add more debug output 2014-04-12 12:42:09 -04:00
Marc-André Moreau
727a4914f2 channels/smartcard: add more debug output 2014-04-11 18:57:04 -04:00
Marc-André Moreau
32b65c3000 channels/smartcard: fix broken context/handle encoding/decoding 2014-04-11 17:44:27 -04:00
Marc-André Moreau
79453d1bb4 channels/smartcard: make handles completely opaque 2014-04-11 16:27:01 -04:00
Marc-André Moreau
f49582614c channels/smartcard: fix on Windows 2014-04-11 14:13:06 -04:00
Marc-André Moreau
f99c8ed8d0 channels/smartcard: cleanup context/handle management 2014-04-11 14:01:42 -04:00
Marc-André Moreau
8cac6519e1 channels/smartcard: added detailed debug tracing 2014-04-11 02:17:36 -04:00
Marc-André Moreau
dd5fab82b5 channels/smartcard: cleanup and simplify ListReaders call 2014-04-10 23:55:11 -04:00
Marc-André Moreau
2b52c294a2 channels/smartcard: minor fixes 2014-04-10 17:36:42 -04:00
Marc-André Moreau
ccea0b1e62 libwinpr-smartcard: more pcsc-lite fixes 2014-04-09 17:44:39 -04:00
Marc-André Moreau
912d7f1e4e libwinpr-smartcard: add proper locking by SCARDCONTEXT for pcsc-lite 2014-04-09 15:32:18 -04:00
Marc-André Moreau
da56c8af62 channels/smartcard: pcsc-lite fixes 2014-04-09 14:27:44 -04:00
Marc-André Moreau
39f04c870e channels/smartcard: fix some valgrind warnings 2014-04-09 12:28:03 -04:00
Marc-André Moreau
b146bad480 channels/smartcard: don't treat certain errors as errors 2014-04-09 10:40:52 -04:00
Marc-André Moreau
b91c10392f channels/smartcard: improve SCardGetAttrib 2014-04-08 23:52:24 -04:00
Marc-André Moreau
46686d391f channels/smartcard: harden parsing of expected padding 2014-04-08 22:10:21 -04:00
Marc-André Moreau
b9e91bf3f6 channels/smartcard: Transmit_Return pioRecvPci implementation 2014-04-08 21:36:47 -04:00
Marc-André Moreau
3e4d30df6c channels/smartcard: fix ListReaders mszGroups parsing 2014-04-08 18:55:50 -04:00
Marc-André Moreau
5ae6ef4495 channels/smartcard: fix GetStatusChange SCARD_E_TIMEOUT handling 2014-04-08 12:00:04 -04:00
Marc-André Moreau
ca1ec811e8 Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard
Conflicts:
	channels/smartcard/client/smartcard_pack.c
2014-04-08 11:34:46 -04:00
Marc-André Moreau
55e23d1ff4 channels/smartcard: fix padding functions 2014-04-08 11:32:48 -04:00
Marc-André Moreau
8cc37ff759 channels/smartcard: harden packing 2014-04-07 23:45:11 -04:00
Marc-André Moreau
e3ae293971 channels/smartcard: more code hardening 2014-04-07 17:17:26 -04:00
Marc-André Moreau
4935199469 channels/smartcard: add more verbose debug output to transmit call 2014-04-07 13:39:47 -04:00
Marc-André Moreau
835e30d233 channels/smartcard: add more debug output to transmit calls 2014-04-07 12:53:38 -04:00
Marc-André Moreau
21c3fd6093 channels/smartcard: fix GetStatusChangeW 2014-04-07 12:38:27 -04:00
Marc-André Moreau
7b4c44c5ff channels/smartcard: handle ntstatus codes 2014-04-07 12:13:31 -04:00
Marc-André Moreau
f158cf0ac3 channels/smartcard: cleanup return codes 2014-04-07 10:59:13 -04:00