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

channels/smartcard: add more verbose debug output to transmit call

Browse Source
This commit is contained in:
Marc-André Moreau 2014-04-07 13:39:47 -04:00
parent 835e30d233
commit 4935199469
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -836,6 +836,9 @@ static UINT32 smartcard_Transmit(SMARTCARD_DEVICE* smartcard, IRP* irp)
if (call.cbRecvLength && !call.fpbRecvBufferIsNULL) if (call.cbRecvLength && !call.fpbRecvBufferIsNULL)
{ {
if (call.cbRecvLength >= 65535)
call.cbRecvLength = 2048;
ret.cbRecvLength = call.cbRecvLength; ret.cbRecvLength = call.cbRecvLength;
ret.pbRecvBuffer = (BYTE*) malloc(ret.cbRecvLength); ret.pbRecvBuffer = (BYTE*) malloc(ret.cbRecvLength);
} }

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

@ -1121,6 +1121,9 @@ UINT32 smartcard_unpack_transmit_call(SMARTCARD_DEVICE* smartcard, wStream* s, T
Stream_Read_UINT32(s, call->fpbRecvBufferIsNULL); /* fpbRecvBufferIsNULL (4 bytes) */ Stream_Read_UINT32(s, call->fpbRecvBufferIsNULL); /* fpbRecvBufferIsNULL (4 bytes) */
Stream_Read_UINT32(s, call->cbRecvLength); /* cbRecvLength (4 bytes) */ Stream_Read_UINT32(s, call->cbRecvLength); /* cbRecvLength (4 bytes) */
printf("Transmit_Call: ioSendPci.dwProtocol: %d ioSendPci.cbExtraBytes: %d pbExtraBytesPtr: %d cbSendLength: %d pbSendBufferNdrPtr: %d pioRecvPciNdrPtr: %d fpbRecvBufferIsNULL: %d cbRecvLength: %d\n",
ioSendPci.dwProtocol, ioSendPci.cbExtraBytes, pbExtraBytesNdrPtr, call->cbSendLength, pbSendBufferNdrPtr, pioRecvPciNdrPtr, call->fpbRecvBufferIsNULL, call->cbRecvLength);
status = smartcard_unpack_redir_scard_handle_ref(smartcard, s, &(call->hCard)); status = smartcard_unpack_redir_scard_handle_ref(smartcard, s, &(call->hCard));
if (status) if (status)
@ -1164,7 +1167,7 @@ UINT32 smartcard_unpack_transmit_call(SMARTCARD_DEVICE* smartcard, wStream* s, T
} }
else else
{ {
call->pioSendPci = (LPSCARD_IO_REQUEST) malloc(sizeof(SCARD_IO_REQUEST)); call->pioSendPci = (LPSCARD_IO_REQUEST) calloc(1, sizeof(SCARD_IO_REQUEST));
if (!call->pioSendPci) if (!call->pioSendPci)
{ {
@ -1216,7 +1219,7 @@ UINT32 smartcard_unpack_transmit_call(SMARTCARD_DEVICE* smartcard, wStream* s, T
if (pioRecvPciNdrPtr) if (pioRecvPciNdrPtr)
{ {
if (Stream_GetRemainingLength(s) < 16) if (Stream_GetRemainingLength(s) < 8)
{ {
WLog_Print(smartcard->log, WLOG_WARN, "Transmit_Call is too short: Actual: %d, Expected: %d", WLog_Print(smartcard->log, WLOG_WARN, "Transmit_Call is too short: Actual: %d, Expected: %d",
(int) Stream_GetRemainingLength(s), 16); (int) Stream_GetRemainingLength(s), 16);
@ -1227,9 +1230,8 @@ UINT32 smartcard_unpack_transmit_call(SMARTCARD_DEVICE* smartcard, wStream* s, T
Stream_Read_UINT32(s, length); /* Length (4 bytes) */ Stream_Read_UINT32(s, length); /* Length (4 bytes) */
Stream_Read_UINT32(s, ioRecvPci.dwProtocol); /* dwProtocol (4 bytes) */ Stream_Read_UINT16(s, ioRecvPci.dwProtocol); /* dwProtocol (2 bytes) */
Stream_Read_UINT32(s, ioRecvPci.cbExtraBytes); /* cbExtraBytes (4 bytes) */ Stream_Read_UINT16(s, ioRecvPci.cbExtraBytes); /* cbExtraBytes (2 bytes) */
Stream_Read_UINT32(s, pbExtraBytesNdrPtr); /* pbExtraBytesNdrPtr (4 bytes) */
if (length < ioRecvPci.cbExtraBytes) if (length < ioRecvPci.cbExtraBytes)
{ {
@ -1279,6 +1281,9 @@ UINT32 smartcard_pack_transmit_return(SMARTCARD_DEVICE* smartcard, wStream* s, T
Stream_Write_UINT32(s, 0); /* pioRecvPciNdrPtr (4 bytes) */ Stream_Write_UINT32(s, 0); /* pioRecvPciNdrPtr (4 bytes) */
printf("Transmit_Return: pioRecvPci: %p pbRecvBuffer: %p cbRecvLength: %d\n",
ret->pioRecvPci, ret->pbRecvBuffer, ret->cbRecvLength);
if (ret->pbRecvBuffer) if (ret->pbRecvBuffer)
{ {
Stream_Write_UINT32(s, ret->cbRecvLength); /* cbRecvLength (4 bytes) */ Stream_Write_UINT32(s, ret->cbRecvLength); /* cbRecvLength (4 bytes) */