kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail SCardEstablishContext if no readers connected

Browse Source 
Windows smartcard application generally behaves better with polling of smartcard
subsystem availability than when there are no smartcard readers available.

This is a potential workaround for issue #109
This commit is contained in:
Henrik Andersson 2017-03-29 13:45:04 +02:00
parent b37cbe9abd
commit 7d8675074f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scard.c
View File

@ -665,6 +665,8 @@ TS_SCardEstablishContext(STREAM in, STREAM out)
MYPCSC_DWORD rv;
MYPCSC_SCARDCONTEXT myHContext;
SERVER_SCARDCONTEXT hContext;
char *readers = NULL;
DWORD readerCount = 1024;
hContext = 0;
@ -679,12 +681,25 @@ TS_SCardEstablishContext(STREAM in, STREAM out)
goto bail_out;
}
if (myHContext == NULL)
if (!myHContext)
{
logger(SmartCard, Error, "TS_SCardEstablishedContext(), myHContext == NULL");
goto bail_out;
}
/* This is a workaround where windows application generally
behaves better with polling of smartcard subsystem
availability than were there are no readers available. */
rv = SCardListReaders(myHContext, NULL, readers, &readerCount);
if (rv != SCARD_S_SUCCESS)
{
logger(SmartCard, Debug,
"TS_SCardEstablishContext(), No readers connected, return no service to client.");
rv = SCARD_E_NO_SERVICE;
goto bail_out;
}
/* add context to list of handle and get server handle */
_scard_handle_list_add(myHContext);