mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels/smartcard: cleanup unpacking of data structures

Browse Source
This commit is contained in:
Marc-André Moreau 2014-04-04 13:57:28 -04:00
parent b12e280ae2
commit 33813c08ec
5 changed files with 172 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channels/smartcard/client/smartcard_main.h
View File

@ -98,7 +98,6 @@ struct _SMARTCARD_DEVICE
};
typedef struct _SMARTCARD_DEVICE SMARTCARD_DEVICE;
BOOL smartcard_async_op(IRP* irp);
void smartcard_device_control(SMARTCARD_DEVICE* smartcard, IRP* irp);
#include "smartcard_pack.h"

147
channels/smartcard/client/smartcard_operations.c
View File

@ -356,34 +356,37 @@ static UINT32 handle_RedirHandleRef(SMARTCARD_DEVICE* smartcard, IRP* irp,
/* Use stored card handle. */
if (redirect & 0x02)
{
DEBUG_WARN("No card handle provided, using stored handle.");
WLog_Print(smartcard->log, WLOG_WARN, "RedirHandleRef no handle provided, using stored handle\n");
*hHandle = smartcard->hCard;
return 0;
}
if (Stream_GetRemainingLength(irp->input) < 4)
{
DEBUG_WARN("length violation %d [%d]", 4,
Stream_GetRemainingLength(irp->input));
WLog_Print(smartcard->log, WLOG_WARN, "RedirHandleRef is too short: Actual: %d, Expected: %d\n",
(int) Stream_GetRemainingLength(irp->input), 4);
return SCARD_F_INTERNAL_ERROR;
}
Stream_Read_UINT32(irp->input, length);
if (length != 4)
Stream_Read_UINT32(irp->input, length); /* Length (4 bytes) */
if ((length != 4) && (length != 8))
{
DEBUG_WARN("length violation %d [%d]", length, 4);
WLog_Print(smartcard->log, WLOG_WARN, "RedirHandleRef length is not 4 or 8: %d\n", length);
return SCARD_F_INTERNAL_ERROR;
}
if (Stream_GetRemainingLength(irp->input) < length)
{
DEBUG_WARN("length violation %d [%d]", length,
Stream_GetRemainingLength(irp->input));
WLog_Print(smartcard->log, WLOG_WARN, "RedirHandleRef is too short: Actual: %d, Expected: %d\n",
(int) Stream_GetRemainingLength(irp->input), length);
return SCARD_F_INTERNAL_ERROR;
}
ZeroMemory(hHandle, sizeof(SCARDHANDLE));
Stream_Read_UINT32(irp->input, *hHandle);
if (length > 4)
Stream_Read_UINT64(irp->input, *hHandle);
else
Stream_Read_UINT32(irp->input, *hHandle);
return 0;
}
@ -449,11 +452,12 @@ static BOOL check_handle_is_forwarded(SMARTCARD_DEVICE* smartcard, SCARDHANDLE h
readerLen = SCARD_AUTOALLOCATE;
status = SCardStatus(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
status = SCardStatusA(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
if (status == SCARD_S_SUCCESS)
{
rc = check_reader_is_forwarded(smartcard, readerName);
if (!rc)
DEBUG_WARN("Reader '%s' not forwarded!", readerName);
}
@ -532,7 +536,6 @@ static void smartcard_output_buffer_limit(IRP* irp, char* buffer, unsigned int l
}
else
{
assert(NULL != buffer);
if (header < length)
length = header;
@ -627,7 +630,7 @@ static UINT32 smartcard_input_reader_name(IRP* irp, char** dest, BOOL wide)
static UINT32 handle_EstablishContext(SMARTCARD_DEVICE* smartcard, IRP* irp)
{
UINT32 status;
UINT32 scope;
EstablishContext_Call call;
SCARDCONTEXT hContext = -1;
status = handle_CommonTypeHeader(smartcard, irp);
@ -640,18 +643,12 @@ static UINT32 handle_EstablishContext(SMARTCARD_DEVICE* smartcard, IRP* irp)
if (status)
return status;
/* Ensure, that the capacity expected is actually available. */
if (Stream_GetRemainingLength(irp->input) < 4)
{
DEBUG_WARN("length violation %d [%d]", 4,
Stream_GetRemainingLength(irp->input));
return SCARD_F_INTERNAL_ERROR;
}
status = smartcard_unpack_establish_context_call(smartcard, irp->input, &call);
/* Read the scope from the stream. */
Stream_Read_UINT32(irp->input, scope);
if (status)
return status;
status = SCardEstablishContext(scope, NULL, NULL, &hContext);
status = SCardEstablishContext(call.dwScope, NULL, NULL, &hContext);
Stream_Write_UINT32(irp->output, 4); /* cbContext (4 bytes) */
Stream_Write_UINT32(irp->output, -1); /* ReferentID (4 bytes) */
@ -740,10 +737,7 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wid
UINT32 status;
SCARDCONTEXT hContext;
DWORD dwReaders;
UINT32 cBytes;
UINT32 fmszReadersIsNull;
UINT32 cchReaders;
LPTSTR mszGroups = NULL;
ListReaders_Call call;
char *readerList = NULL, *walker;
int elemLength, dataLength;
int pos, poslen1, poslen2, allowed_pos;
@ -763,44 +757,10 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wid
if (status)
goto finish;
if (Stream_GetRemainingLength(irp->input) < 16)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders is too short: %d",
(int) Stream_GetRemainingLength(irp->input));
status = smartcard_unpack_list_readers_call(smartcard, irp->input, &call);
if (status)
goto finish;
}
printf("cBytes:\n");
winpr_HexDump(Stream_Pointer(irp->input), Stream_GetRemainingLength(irp->input));
Stream_Read_UINT32(irp->input, cBytes); /* cBytes (4 bytes) */
if (Stream_GetRemainingLength(irp->input) < cBytes)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders is too short: Actual: %d, Expected: %d",
(int) Stream_GetRemainingLength(irp->input), cBytes);
goto finish;
}
if (cBytes)
{
mszGroups = malloc(cBytes);
Stream_Read(irp->input, mszGroups, cBytes); /* mszGroups */
}
else
{
Stream_Seek(irp->input, 4); /* mszGroups */
}
Stream_Read_UINT32(irp->input, fmszReadersIsNull); /* fmszReadersIsNull (4 bytes) */
Stream_Read_UINT32(irp->input, cchReaders); /* cchReaders (4 bytes) */
if (Stream_GetRemainingLength(irp->input) < 4)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders is too short: %d",
(int) Stream_GetRemainingLength(irp->input));
goto finish;
}
/* Read RedirScardcontextRef */
status = handle_RedirContextRef(smartcard, irp, redirect, &hContext);
@ -808,10 +768,8 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wid
if (status)
goto finish;
/* ignore rest of [MS-RDPESC] 2.2.2.4 ListReaders_Call */
dwReaders = SCARD_AUTOALLOCATE;
status = SCardListReaders(hContext, mszGroups, (LPSTR) &readerList, &dwReaders);
status = SCardListReadersA(hContext, (LPCSTR) call.mszGroups, (LPSTR) &readerList, &dwReaders);
if (status != SCARD_S_SUCCESS)
{
@ -874,8 +832,8 @@ finish:
SCardFreeMemory(hContext, readerList);
}
if (mszGroups)
free(mszGroups);
if (call.mszGroups)
free(call.mszGroups);
return status;
}
@ -1012,7 +970,7 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
readerStates = NULL;
}
status = SCardGetStatusChange(hContext, (DWORD) dwTimeout, readerStates, (DWORD) readerCount);
status = SCardGetStatusChangeA(hContext, (DWORD) dwTimeout, readerStates, (DWORD) readerCount);
Stream_Write_UINT32(irp->output, readerCount);
Stream_Write_UINT32(irp->output, 0x00084dd8);
@ -1148,7 +1106,7 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
goto finish;
}
status = SCardConnect(hContext, readerName, (DWORD) dwShareMode,
status = SCardConnectA(hContext, readerName, (DWORD) dwShareMode,
(DWORD) dwPreferredProtocol, &hCard, (DWORD *) &dwActiveProtocol);
smartcard->hCard = hCard;
@ -1510,7 +1468,7 @@ static DWORD handle_Status(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
pbAtr = malloc(sizeof(BYTE) * atrLen);
readerLen = SCARD_AUTOALLOCATE;
status = SCardStatus(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
status = SCardStatusA(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
if (status != SCARD_S_SUCCESS)
{
@ -2166,7 +2124,7 @@ static UINT32 handle_LocateCardsByATR(SMARTCARD_DEVICE* smartcard, IRP* irp, BOO
cur->dwCurrentState |= SCARD_STATE_IGNORE;
}
status = SCardGetStatusChange(hContext, 0x00000001, readerStates, readerCount);
status = SCardGetStatusChangeA(hContext, 0x00000001, readerStates, readerCount);
if (status != SCARD_S_SUCCESS)
{
@ -2190,7 +2148,7 @@ static UINT32 handle_LocateCardsByATR(SMARTCARD_DEVICE* smartcard, IRP* irp, BOO
}
if (equal)
{
rsCur->dwEventState |= 0x00000040; /* SCARD_STATE_ATRMATCH 0x00000040 */
rsCur->dwEventState |= SCARD_STATE_ATRMATCH;
}
}
}
@ -2228,43 +2186,6 @@ finish:
return status;
}
BOOL smartcard_async_op(IRP* irp)
{
UINT32 ioctl_code;
/* peek ahead */
Stream_Seek(irp->input, 8);
Stream_Read_UINT32(irp->input, ioctl_code);
Stream_Rewind(irp->input, 12);
switch (ioctl_code)
{
/* non-blocking events */
case SCARD_IOCTL_ACCESSSTARTEDEVENT:
case SCARD_IOCTL_ESTABLISHCONTEXT:
case SCARD_IOCTL_RELEASECONTEXT:
case SCARD_IOCTL_ISVALIDCONTEXT:
return FALSE;
break;
/* async events */
case SCARD_IOCTL_GETSTATUSCHANGEA:
case SCARD_IOCTL_GETSTATUSCHANGEW:
case SCARD_IOCTL_TRANSMIT:
case SCARD_IOCTL_STATUSA:
case SCARD_IOCTL_STATUSW:
//return TRUE;
return FALSE;
break;
default:
break;
}
/* default to async */
return TRUE;
}
void smartcard_device_control(SMARTCARD_DEVICE* smartcard, IRP* irp)
{
UINT32 pos;
@ -2352,8 +2273,10 @@ void smartcard_device_control(SMARTCARD_DEVICE* smartcard, IRP* irp)
break;
case SCARD_IOCTL_LISTREADERGROUPSA:
result = SCARD_F_INTERNAL_ERROR;
break;
case SCARD_IOCTL_LISTREADERGROUPSW:
/* typically not used unless list_readers fail */
result = SCARD_F_INTERNAL_ERROR;
break;

54
channels/smartcard/client/smartcard_pack.c
View File

@ -23,4 +23,58 @@
#include "smartcard_pack.h"
UINT32 smartcard_unpack_establish_context_call(SMARTCARD_DEVICE* smartcard, wStream* s, EstablishContext_Call* call)
{
if (Stream_GetRemainingLength(s) < 4)
{
WLog_Print(smartcard->log, WLOG_WARN, "EstablishContext_Call is too short: Actual: %d, Expected: %d\n",
(int) Stream_GetRemainingLength(s), 4);
return SCARD_F_INTERNAL_ERROR;
}
Stream_Read_UINT32(s, call->dwScope); /* dwScope (4 bytes) */
return SCARD_S_SUCCESS;
}
UINT32 smartcard_unpack_list_readers_call(SMARTCARD_DEVICE* smartcard, wStream* s, ListReaders_Call* call)
{
if (Stream_GetRemainingLength(s) < 16)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders_Call is too short: %d",
(int) Stream_GetRemainingLength(s));
return SCARD_F_INTERNAL_ERROR;
}
Stream_Read_UINT32(s, call->cBytes); /* cBytes (4 bytes) */
if (Stream_GetRemainingLength(s) < call->cBytes)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders_Call is too short: Actual: %d, Expected: %d",
(int) Stream_GetRemainingLength(s), call->cBytes);
return SCARD_F_INTERNAL_ERROR;
}
if (call->cBytes)
{
call->mszGroups = malloc(call->cBytes);
Stream_Read(s, call->mszGroups, call->cBytes); /* mszGroups */
}
else
{
call->mszGroups = NULL;
Stream_Seek(s, 4); /* mszGroups */
}
Stream_Read_UINT32(s, call->fmszReadersIsNULL); /* fmszReadersIsNULL (4 bytes) */
Stream_Read_UINT32(s, call->cchReaders); /* cchReaders (4 bytes) */
if (Stream_GetRemainingLength(s) < 4)
{
WLog_Print(smartcard->log, WLOG_WARN, "ListReaders_Call is too short: %d",
(int) Stream_GetRemainingLength(s));
return SCARD_F_INTERNAL_ERROR;
}
return SCARD_S_SUCCESS;
}

40
channels/smartcard/client/smartcard_pack.h
View File

@ -21,8 +21,11 @@
#define FREERDP_CHANNEL_SMARTCARD_CLIENT_PACK_H
#include <winpr/crt.h>
#include <winpr/stream.h>
#include <winpr/smartcard.h>
#include "smartcard_main.h"
/* interface type_scard_pack */
/* [unique][version][uuid] */
@ -61,27 +64,27 @@ typedef struct _Context_Call
typedef struct _ContextAndStringA_Call
{
REDIR_SCARDCONTEXT Context;
/* [string] */ const unsigned char *sz;
/* [string] */ unsigned char *sz;
} ContextAndStringA_Call;
typedef struct _ContextAndStringW_Call
{
REDIR_SCARDCONTEXT Context;
/* [string] */ const WCHAR *sz;
/* [string] */ WCHAR *sz;
} ContextAndStringW_Call;
typedef struct _ContextAndTwoStringA_Call
{
REDIR_SCARDCONTEXT Context;
/* [string] */ const unsigned char *sz1;
/* [string] */ const unsigned char *sz2;
/* [string] */ unsigned char *sz1;
/* [string] */ unsigned char *sz2;
} ContextAndTwoStringA_Call;
typedef struct _ContextAndTwoStringW_Call
{
REDIR_SCARDCONTEXT Context;
/* [string] */ const WCHAR *sz1;
/* [string] */ const WCHAR *sz2;
/* [string] */ WCHAR *sz1;
/* [string] */ WCHAR *sz2;
} ContextAndTwoStringW_Call;
typedef struct _EstablishContext_Call
@ -106,7 +109,7 @@ typedef struct _ListReaders_Call
{
REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes;
/* [size_is][unique] */ const BYTE *mszGroups;
/* [size_is][unique] */ BYTE *mszGroups;
long fmszReadersIsNULL;
unsigned long cchReaders;
} ListReaders_Call;
@ -121,13 +124,13 @@ typedef struct _ReaderState_Common_Call
typedef struct _ReaderStateA
{
/* [string] */ const unsigned char *szReader;
/* [string] */ unsigned char *szReader;
ReaderState_Common_Call Common;
} ReaderStateA;
typedef struct _ReaderStateW
{
/* [string] */ const WCHAR *szReader;
/* [string] */ WCHAR *szReader;
ReaderState_Common_Call Common;
} ReaderStateW;
@ -143,7 +146,7 @@ typedef struct _GetStatusChangeA_Call
{
REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes;
/* [size_is] */ const BYTE *mszCards;
/* [size_is] */ BYTE *mszCards;
/* [range] */ unsigned long cReaders;
/* [size_is] */ ReaderStateA *rgReaderStates;
} GetStatusChangeA_Call;
@ -152,7 +155,7 @@ typedef struct _LocateCardsA_Call
{
REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes;
/* [size_is] */ const BYTE *mszCards;
/* [size_is] */ BYTE *mszCards;
/* [range] */ unsigned long cReaders;
/* [size_is] */ ReaderStateA *rgReaderStates;
} LocateCardsA_Call;
@ -161,7 +164,7 @@ typedef struct _LocateCardsW_Call
{
REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes;
/* [size_is] */ const BYTE *mszCards;
/* [size_is] */ BYTE *mszCards;
/* [range] */ unsigned long cReaders;
/* [size_is] */ ReaderStateW *rgReaderStates;
} LocateCardsW_Call;
@ -217,13 +220,13 @@ typedef struct _Connect_Common
typedef struct _ConnectA_Call
{
/* [string] */ const unsigned char *szReader;
/* [string] */ unsigned char *szReader;
Connect_Common Common;
} ConnectA_Call;
typedef struct _ConnectW_Call
{
/* [string] */ const WCHAR *szReader;
/* [string] */ WCHAR *szReader;
Connect_Common Common;
} ConnectW_Call;
@ -301,7 +304,7 @@ typedef struct _Transmit_Call
REDIR_SCARDHANDLE hCard;
SCardIO_Request ioSendPci;
/* [range] */ unsigned long cbSendLength;
/* [size_is] */ const BYTE *pbSendBuffer;
/* [size_is] */ BYTE *pbSendBuffer;
/* [unique] */ SCardIO_Request *pioRecvPci;
long fpbRecvBufferIsNULL;
unsigned long cbRecvLength;
@ -331,7 +334,7 @@ typedef struct _Control_Call
REDIR_SCARDHANDLE hCard;
unsigned long dwControlCode;
/* [range] */ unsigned long cbInBufferSize;
/* [size_is][unique] */ const BYTE *pvInBuffer;
/* [size_is][unique] */ BYTE *pvInBuffer;
long fpvOutBufferIsNULL;
unsigned long cbOutBufferSize;
} Control_Call;
@ -363,7 +366,7 @@ typedef struct _SetAttrib_Call
REDIR_SCARDHANDLE hCard;
unsigned long dwAttrId;
/* [range] */ unsigned long cbAttrLen;
/* [size_is] */ const BYTE *pbAttr;
/* [size_is] */ BYTE *pbAttr;
} SetAttrib_Call;
typedef struct _ReadCache_Common
@ -415,4 +418,7 @@ typedef struct _WriteCacheW_Call
WriteCache_Common Common;
} WriteCacheW_Call;
UINT32 smartcard_unpack_establish_context_call(SMARTCARD_DEVICE* smartcard, wStream* s, EstablishContext_Call* call);
UINT32 smartcard_unpack_list_readers_call(SMARTCARD_DEVICE* smartcard, wStream* s, ListReaders_Call* call);
#endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_PACK_H */

60
winpr/libwinpr/smartcard/smartcard.c
View File

@ -196,6 +196,16 @@ WINSCARDAPI LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT hContext,
{
InitializeSCardStubs();
if (g_PCSCLite && g_PCSCLite->pfnSCardListReaderGroups)
{
mszGroups = NULL;
pcchGroups = 0;
/* FIXME: unicode conversion */
return g_PCSCLite->pfnSCardListReaderGroups(hContext, (LPSTR) mszGroups, pcchGroups);
}
return 0;
}
@ -217,6 +227,18 @@ WINSCARDAPI LONG WINAPI SCardListReadersW(SCARDCONTEXT hContext,
{
InitializeSCardStubs();
if (g_PCSCLite && g_PCSCLite->pfnSCardListReaders)
{
mszGroups = NULL;
mszReaders = NULL;
pcchReaders = 0;
/* FIXME: unicode conversion */
return g_PCSCLite->pfnSCardListReaders(hContext, (LPSTR) mszGroups, (LPSTR) mszReaders, pcchReaders);
}
return 0;
}
@ -421,6 +443,17 @@ WINSCARDAPI LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT hContext,
{
InitializeSCardStubs();
if (g_PCSCLite && g_PCSCLite->pfnSCardGetStatusChange)
{
SCARD_READERSTATEA rgReaderStatesA;
cReaders = 0;
ZeroMemory(&rgReaderStatesA, sizeof(SCARD_READERSTATEA));
/* FIXME: unicode conversion */
return g_PCSCLite->pfnSCardGetStatusChange(hContext, dwTimeout, &rgReaderStatesA, cReaders);
}
return 0;
}
@ -457,6 +490,22 @@ WINSCARDAPI LONG WINAPI SCardConnectW(SCARDCONTEXT hContext,
{
InitializeSCardStubs();
if (g_PCSCLite && g_PCSCLite->pfnSCardConnect)
{
LONG status;
LPSTR szReaderA = NULL;
if (szReader)
ConvertFromUnicode(CP_UTF8, 0, szReader, -1, &szReaderA, 0, NULL, NULL);
status = g_PCSCLite->pfnSCardConnect(hContext, szReaderA,
dwShareMode, dwPreferredProtocols, phCard, pdwActiveProtocol);
free(szReaderA);
return status;
}
return 0;
}
@ -544,6 +593,17 @@ WINSCARDAPI LONG WINAPI SCardStatusW(SCARDHANDLE hCard,
{
InitializeSCardStubs();
if (g_PCSCLite && g_PCSCLite->pfnSCardStatus)
{
mszReaderNames = NULL;
pcchReaderLen = 0;
/* FIXME: unicode conversion */
return g_PCSCLite->pfnSCardStatus(hCard, (LPSTR) mszReaderNames, pcchReaderLen,
pdwState, pdwProtocol, pbAtr, pcbAtrLen);
}
return 0;
}