mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,071 Commits 6 Branches 74 Tags 84 MiB
d3716ef0ba
Commit Graph

147 Commits

Author SHA1 Message Date
dodo040
2f22e679e0 fix format code 2017-07-19 13:16:08 +02:00
dodo040
4e055453ab fix smartcard argument parsing 2017-07-19 13:16:08 +02:00
dodo040
722e927c64 redirect specific smartcard readers 2017-07-19 13:16:08 +02:00
Andreas Schultz
d2f98261f7 smartcard: implement ListReaderGroups 
Conflicts:
	channels/smartcard/client/smartcard_operations.c
	channels/smartcard/client/smartcard_pack.c
	channels/smartcard/client/smartcard_pack.h

smartcard_operations: move handling of call argument into functions

The call argument was only use by static functions and was always equal
to operation->call. Remove the argument and use operation-call directly.

Also put the memory allocation and check into the same place.

Conflicts:
	channels/smartcard/client/smartcard_operations.c

Updated formatting and API
 2017-02-16 16:59:03 +01:00
Armin Novak
eacf2b542e Fixed memory leaks. 2016-05-12 10:01:30 +02:00
clangm
62a559ad03 fix typo 
Pretty sure that's supposed to be __MACOSX__, not __MAXOSX__
 2016-01-27 15:40:08 -07:00
bjcollins
ac67e25007 Give unique aliases for smartcards with the same name, so that two readers do not end up with the same alias. 2015-09-02 12:11:47 -05:00
Rostislav Kondratenko
3f81ff87a6 Removing private context on hCard so that transaction will properly unlock when context is released. 2015-07-17 18:13:41 +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
Bernhard Miklautz
bf73f4e4f1 Fix unchecked strdups 
* add missing checks
* adapt function return values where necessary
* add initial test for settings
 2015-06-22 19:09:59 +02:00
David FORT
29d372480a Take in account nfedera's review 2015-05-20 19:19:50 +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
ef1fd12b15 Fix unchecked CreateEvent calls and misc fixes 
1)
Added missing checks for CreateEvent which also required the
following related changes:

- changed freerdp_context_new API to BOOL
- changed freerdp_peer_context_new API to BOOL
- changed pRdpClientNew callback to BOOL
- changed pContextNew callback to BOOL
- changed psPeerAccepted callback to BOOL
- changed psPeerContextNew callback to BOOL

2)
Fixed lots of missing alloc and error checks in the
changed code's neighbourhood.

3)
Check freerdp_client_codecs_prepare result to avoid segfaults
caused by using non-initialized codecs.

4)
Fixed deadlocks in x11 caused by missing xf_unlock_x11() calls
in some error handlers

5)
Some fixes in thread pool:
- DEFAULT_POOL assignment did not match TP_POOL definition
- don't free the pool pointer if it points to the static DEFAULT_POOL
- added error handling and cleanup in InitializeThreadpool
 2015-04-29 18:18:39 +02:00
Armin Novak
60de56e1bb Fixed NULL dereference and double free 2015-04-16 21:56:57 +02:00
Bernhard Miklautz
a8c44f15c0 winpr: small fixes and cleanups 
Update the pull request and integrate the latest comments and
suggestions.

* TestLibrary*: fix typo in error message
* TestPipeCreateNamedPipeOverlapped: free possibly allocated memory
* smartcard_pcsc.c: format fix
* process.c: add missing NULL check
* MessageQueue.c: delete possibly initialized critical section on error
 2015-04-08 11:34:37 +02:00
Bernhard Miklautz
850de59b55 winpr: add checks for *alloc 
Add missing checks if memory allocation was successful. Also adapt
caller(s) when possible.
 2015-04-08 11:34:37 +02:00
Marc-André Moreau
cb002d91cd channels/smartcard: fix pioRecvPci with cbExtraBytes > 0 2015-03-13 14:20:57 -04:00
Marc-André Moreau
6b6c368e3a libwinpr-smartcard: stub new transaction system 2015-01-20 21:40:45 -05:00
Marc-André Moreau
344a1b52ca libwinpr-smartcard: remove unused (and useless) pcsc-lite static link option 2015-01-20 20:15:10 -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
73cfa920a9 libwinpr-smartcard: add SCARD_ATTR_CHANNEL_ID 2015-01-19 14:56:02 -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
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
Vincent Sourin
719e5c9cdb Determine OSX Version ... only on OSX 2014-12-14 15:15:33 +01:00
Vincent Sourin
8a028f78e2 * Determine OS X Version at runtime 2014-12-13 05:30:44 -08:00
Vincent Sourin
956cece54b * Correct detection of Mac OS X Yosemite Version 2014-12-09 22:14:06 +01:00
Vincent Sourin
64ff9ee1b6 SmartCard 
* Check for NULL parameters in PCSC_ConvertReaderNameToWinSCard (Issue #2184)
* Remove masking of dwEventState as it is not needed under Linux and MacOSX and it helps in ThinLinc environment
* Workaround for Mac OS X Yosemite (10.10) SCardStatus Bug (Issue #2184)
* Since Mac OS Tiger (10.5.6), Apple introduced new function for SCardControl calls named SCardControl132(), the old SCardControl doesn't work (cf. https://opensource.apple.com/source/SmartCardServices/SmartCardServices-55111/src/PCSC/winscard_clnt.c)
 2014-12-09 20:14:57 +01:00
Armin Novak
55e455f1ab Fixed memory leaks. 2014-11-16 22:50:50 +01:00
Armin Novak
b7d5bf49f8 Fixed NULL pointer dereference. 2014-11-16 16:53:55 +01:00
Marc-André Moreau
367ceff02c libwinpr-smartcard: revert minor change from pull request #2195 2014-11-11 12:00:37 -05:00
Marc-André Moreau
d4bdf52b07 libwinpr-smartcard: re-enable SCardGetStatusChange status filtering 2014-11-11 11:46:59 -05:00
Vinche
d427faf5c6 Cleaning Code 2014-11-10 23:51:34 +01:00
Vinche
fdb95c712b Implementation for Smartcard Reader with Pin Pad 2014-11-10 23:40:22 +01:00
Vinche
69766de29f Add comments to modifications 2014-11-09 23:02:12 +01:00
Vinche
bbff8db75f Add comments to modifications 2014-11-09 23:00:41 +01:00
Vinche
2708a8de5c first commit 2014-11-09 22:42:35 +01:00
Armin Novak
a15df299e9 Removed last remainig printf. 2014-09-09 16:32:23 +02:00
Armin Novak
b22b897389 Reformatted changed files. 2014-09-09 16:32:22 +02:00
Armin Novak
7e3a1b3073 Now using macro to generate module specific log tag. 2014-09-09 16:32:04 +02:00
Armin Novak
28ece6bb46 Replaced stdio logging with WLog 2014-09-09 16:31:46 +02:00
Marc-André Moreau
659f80e172 libwinpr-smartcard: avoid using pcsc-lite's buggy transaction system 2014-06-02 21:49:49 -04:00
Marc-André Moreau
f5bfb98aca channels/smartcard: experiment with multiple card contexts 2014-06-02 17:20:01 -04:00
Mike McDonald
ed8ea297e7 Modified SCardConnect/SCardDisconnect logic to prevent more than one card from being connected to a context. Trying to connect more than once to a context without doing a disconnect can cause a deadlock in the pcsclite daemon (pcscd). 2014-06-02 11:08:32 -04:00
Marc-André Moreau
003870157a libwinpr-smartcard: remove some locks 2014-05-12 17:28:35 -04:00
Marc-André Moreau
2da6111972 channels/smartcard: fix clearing of rgSCardContextList 2014-05-12 10:17:49 -04:00
Marc-André Moreau
ae6c778eb7 libwinpr-smartcard: modifying threading 2014-05-11 05:23:30 -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
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
38c77eb57c libwinpr-smartcard: fix SCardGetAttrib for friendly name (unicode) 2014-05-05 17:27:29 -04: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
86b018ee21 libwinpr-smartcard: fix pcsc-lite SCARD_IO_REQUEST incompatibility 2014-05-03 14:20:17 -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
c9a223a06b libwinpr-smartcard: return SCARD_NO_SERVICE when no internal callback is registered 2014-04-27 20:11:31 -04:00
Marc-André Moreau
5db851a154 libwinpr-smartcard: update PCSC-WinPR instructions (WIP) 2014-04-27 17:38:45 -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
cee67b9c5f libwinpr-smartcard: improve pcsc-lite wrapper robustness 2014-04-25 19:26:55 -07:00
Marc-André Moreau
237eb6140a libwinpr-smartcard: fix for pcsc-lite SCardGetStatusChange 2014-04-25 20:07:29 -04:00
Marc-André Moreau
746e8a6929 libwinpr-smartcard: fix usage of native data types 2014-04-25 18:49:57 -04:00
Marc-André Moreau
19b9ed3bb0 channels/smartcard: some Mac OS X fixes 2014-04-16 14:03:22 -04:00
Marc-André Moreau
77a50401a7 channels/smartcard: fix autoallocate wrapper 2014-04-15 18:45:38 -04:00
Marc-André Moreau
6d7f3cd00c libwinpr-smartcard: fix SCardGetAttrib SCARD_ATTR_CURRENT_PROTOCOL_TYPE 2014-04-15 18:01:26 -04:00
Marc-André Moreau
fc885dc4b7 libwinpr-smartcard: fix SCardGetAttrib 2014-04-15 17:51:39 -04:00
Marc-André Moreau
a675800d68 channels/smartcard: fix multi-line handling 2014-04-15 16:48:25 -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
9afe63aa76 libwinpr-smartcard: improve GetStatusChange 2014-04-13 00:43:12 -04:00
Marc-André Moreau
a352044c7a libwinpr-smartcard: implement PCSC/WinSCard reader name aliasing 2014-04-12 23:38:15 -04:00
Marc-André Moreau
2f3c3c4bb1 channels/smartcard: add pcsc-lite protocol value mapping 2014-04-12 18:13:18 -04:00
Marc-André Moreau
1d864fe9af channels/smartcard: make PCSC implementation even closer to WinSCard 2014-04-12 16:45:06 -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
ee9f44ce5a libwinpr-smartcard: fix SCardConnectW deadlock 2014-04-12 12:15:04 -04:00
Marc-André Moreau
c106b62920 libwinpr-smartcard: fix deadlock in PCSC_SCardFreeMemory 2014-04-12 11:24:47 -04:00
Marc-André Moreau
79453d1bb4 channels/smartcard: make handles completely opaque 2014-04-11 16:27:01 -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
b91c10392f channels/smartcard: improve SCardGetAttrib 2014-04-08 23:52:24 -04:00
Marc-André Moreau
a32d814218 libwinpr-smartcard: implement SCARD_AUTOALLOCATE 2014-04-08 21:02:30 -04:00
Marc-André Moreau
3e4d30df6c channels/smartcard: fix ListReaders mszGroups parsing 2014-04-08 18:55:50 -04:00
Marc-André Moreau
3a428b87df libwinpr-smartcard: add option to build statically against specialized pcsclite build 2014-04-08 01:26:28 -04:00
Marc-André Moreau
e3ae293971 channels/smartcard: more code hardening 2014-04-07 17:17:26 -04:00
Marc-André Moreau
21c3fd6093 channels/smartcard: fix GetStatusChangeW 2014-04-07 12:38:27 -04:00
Marc-André Moreau
e75b9aa9fa channels/smartcard: more unpacking 2014-04-07 01:19:58 -04:00
Marc-André Moreau
c2fb729167 channels/smartcard: implement clean SCardStatusW 2014-04-07 00:58:34 -04:00
Marc-André Moreau
bbfd4fb361 channels/smartcard: implement clean ListReadersW 2014-04-07 00:10:27 -04:00
Marc-André Moreau
9dd9f8c7bf channels/smartcard: more unpacking 2014-04-06 21:09:49 -04:00
Marc-André Moreau
a22b7af2b9 channels/smartcard: unpacking improvements 2014-04-06 16:29:11 -04:00
Marc-André Moreau
600218dfb2 channels/smartcard: cleanup ConnectA/ConnectW parsing 2014-04-05 16:06:46 -04:00
Marc-André Moreau
f9ada64587 libwinpr-smartcard: fix compilation on Windows 2014-04-04 16:45:11 -04:00
Marc-André Moreau
06bf1ecc95 libwinpr-smartcard: implement dynamic API stubs 2014-04-04 15:30:03 -04:00