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

chansrv: some minor smartcard changes

Browse Source
This commit is contained in:
Jay Sorg 2013-12-11 13:29:15 -08:00
parent e118463ebc
commit cd2eca5573
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sesman/chansrv/smartcard.c
View File

@ -1924,7 +1924,7 @@ scard_send_Transmit(IRP *irp, tui32 sc_handle, char *send_data,
{
/* map4 */
out_uint32_le(s, recv_ior->dwProtocol);
out_uint32_le(s, recv_ior->cbPciLength - 8);
out_uint32_le(s, recv_ior->cbPciLength);
val = recv_ior->extra_bytes > 0 ? 1 : 0;
out_uint32_le(s, val); /* map6*/
if (val)

11
sesman/chansrv/smartcard_pcsc.c
View File

@ -481,7 +481,8 @@ scard_function_disconnect_return(struct trans *con,
in_uint32_le(in_s, dwActiveProtocol);
in_uint8s(in_s, 4);
in_uint32_le(in_s, hCard);
LLOGLN(10, ("scard_function_connect_return: hCard %d dwActiveProtocol %d", hCard, dwActiveProtocol));
LLOGLN(10, ("scard_function_connect_return: hCard %d "
"dwActiveProtocol %d", hCard, dwActiveProtocol));
}
out_s = trans_get_out_s(con, 8192);
s_push_layer(out_s, iso_hdr, 8);
@ -703,11 +704,15 @@ scard_function_transmit_return(struct trans *con,
in_uint8p(in_s, recv_ior.extra_data, recv_ior.extra_bytes);
}
}
in_uint32_le(in_s, cbRecvLength);
if (cbRecvLength > 0)
in_uint8s(in_s, 4);
in_uint32_le(in_s, val);
if (val != 0)
{
in_uint32_le(in_s, cbRecvLength);
in_uint8p(in_s, recvBuf, cbRecvLength);
}
}
LLOGLN(10, ("scard_function_transmit_return: cbRecvLength %d", cbRecvLength));
out_s = trans_get_out_s(con, 8192);