Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2019.09.11 #25

Merged
merged 4 commits into from
Sep 11, 2019
Merged

v2019.09.11 #25

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d3b1f3
Merge remote-tracking branch 'refs/remotes/origin/master' into devel
petrs Jul 17, 2019
c2b5674
fixed bug preventing work with remote readers when no local is presen…
petrs Sep 11, 2019
fb35c26
SCardGetStatusChangeW implemented correctly for remote readers
petrs Sep 11, 2019
5d07d09
added new release version 2019.09.11
petrs Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SCardGetStatusChangeW implemented correctly for remote readers
  • Loading branch information
@petrs
petrs committed Sep 11, 2019
commit fb35c264a419c4bd82d2c93f04401b21c0d848de
42 changes: 23 additions & 19 deletions Winscard/Winscard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,34 +1993,38 @@ SCard LONG STDCALL SCardGetStatusChangeW(
IN OUT LPSCARD_READERSTATEW rgReaderStates,
IN DWORD cReaders
) {
LONG status = SCARD_S_SUCCESS;
LogWinscardRules(_CONV("SCardGetStatusChangeW called\n"));

char readerNameA[1000];
memset(readerNameA, 0, sizeof(readerNameA));
// Convert wchar to ascii
std::wstring_convert<std::codecvt_utf8<wchar_t>> convertor;
//std::string readerNameA = convertor.to_bytes(rgReaderStates->szReader);
int len = wcslen(rgReaderStates->szReader);
if (sizeof(readerNameA) < len) {
return SCARD_F_INTERNAL_ERROR;
}
for (int i = 0; i < len; i++) {
readerNameA[i] = (char) rgReaderStates->szReader[i];
}
//std::string readerNameA = convertor.to_bytes(rgReaderStates->szReader);
if (sizeof(readerNameA) < len) { return SCARD_F_INTERNAL_ERROR; }
for (int i = 0; i < len; i++) { readerNameA[i] = (char)rgReaderStates->szReader[i];}

LogWinscardRules(_CONV("SCardGetStatusChangeW called\n"));
string_type message = string_format(_CONV("-> rgReaderStates.szReader: '%s'\n"), readerNameA);
//string_type message = string_format(_CONV("-> rgReaderStates.szReader: %s\n"), rgReaderStates->szReader);
string_type message = string_format(_CONV("-> rgReaderStates.szReader: %s\n"), readerNameA);
LogWinscardRules(message);

LONG status = SCARD_S_SUCCESS;
if (theApp.IsRemoteReader(readerNameA)) {
status = SCARD_S_SUCCESS;
status = SCARD_S_SUCCESS;
rgReaderStates->dwEventState = 0x00010422;

// Set ATR based on previously retrieved value
if (theApp.remoteCardsATRMap.find(readerNameA) != theApp.remoteCardsATRMap.end()) {
string_type atr = theApp.remoteCardsATRMap[readerNameA];
rgReaderStates->cbAtr = 0x24;
CCommonFnc::BYTE_ConvertFromHexStringToArray(atr, rgReaderStates->rgbAtr, &(rgReaderStates->cbAtr));
}
else {
rgReaderStates->cbAtr = 0x00;
}
}
else {
status = (*Original_SCardGetStatusChangeW)(hContext, dwTimeout, rgReaderStates, cReaders);
}
message = string_format(_CONV("-> return status: 0x%x\n"), status);
LogWinscardRules(message);

return status;
}

Expand Down Expand Up @@ -3501,8 +3505,8 @@ LONG CWinscardApp::Remote_SendRequest(REMOTE_CONFIG* pRemoteConfig, string_type
string_type l = Remote_FormatRequest(targetReader, theApp.m_remoteConfig.nextCommandID, command, commandData, "", CMD_LINE_SEPARATOR);
pRemoteConfig->pSocket->SendLine(l);
replace(l.begin(), l.end(), '\n', ' ');
message = string_format(_CONV("::-> %s\n"), l.c_str());
//message = string_format(_CONV("::-> %s %s\n"), command.c_str(), "(hidden data)");
//message = string_format(_CONV("::-> %s\n"), l.c_str());
message = string_format(_CONV("::-> %s %s\n"), command.c_str(), "(hidden data)");
LogWinscardRules(message);
if (REMOTE_APDU_RESPONSE_WAIT_TIME > 0) {
_sleep(REMOTE_APDU_RESPONSE_WAIT_TIME);
Expand All @@ -3514,8 +3518,8 @@ LONG CWinscardApp::Remote_SendRequest(REMOTE_CONFIG* pRemoteConfig, string_type
status = Remote_ParseResponse(l, theApp.m_remoteConfig.nextCommandID, pResponse);

replace(pResponse->begin(), pResponse->end(), '\n', ' ');
message = string_format(_CONV("::<- %s\n"), pResponse->c_str());
//message = string_format(_CONV("::<- %s\n"), "(hidden response)");
//message = string_format(_CONV("::<- %s\n"), pResponse->c_str());
message = string_format(_CONV("::<- %s\n"), "(hidden response)");
LogWinscardRules(message);

if (pRemoteConfig->bOpenSocketForEveryCommand) {
Expand Down