libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

Apple Bug not resolved, retry more than once (up to 100 times); refs #34

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-12-01 09:08:42 +00:00
parent 6cfc6d8f23
commit 742edbecf5
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pcsc.hxx
View File

@@ -320,22 +320,28 @@ namespace pcsc {
reconnect, first transaction (SCardTransmit) reconnect, first transaction (SCardTransmit)
fails with SCARD_W_RESET_CARD fails with SCARD_W_RESET_CARD
(0x80100068). */ (0x80100068). */
if (_state==SCARD_W_RESET_CARD) { // just resend once for (int bugCnt(0);
bugCnt<100 && _state==SCARD_W_RESET_CARD;
++bugCnt) { // just try to resend
CRYPTOLOG("Mac OS X 10.10 implementation bug: " CRYPTOLOG("Mac OS X 10.10 implementation bug: "
"On Mac OSX 10.10 there is a bug in " "On Mac OSX 10.10 there is a bug in "
"PCSC: After a reconnect, first " "PCSC: After a reconnect, first "
"transaction (SCardTransmit) fails " "transaction (SCardTransmit) fails "
"with SCARD_W_RESET_CARD (0x80100068). " "with SCARD_W_RESET_CARD (0x80100068). "
"Retry once."); "Retry Nr. "<<bugCnt);
check(SCardTransmit(_id, &rPci, try {
(LPCBYTE)in.c_str(), check(SCardTransmit(_id, &rPci,
in.size(), (LPCBYTE)in.c_str(),
0, buff, &len), in.size(),
"smartcard transmit message "+crypto::hex(in)); 0, buff, &len),
"smartcard transmit resend message "+crypto::hex(in));
} catch (...) {
continue; // try again
}
break; // success
} }
# else
throw; // just rethrow otherwise
# endif # endif
throw; // just rethrow otherwise
} }
//CRYPTOLOG(" -> "<<crypto::hex(std::string((char*)buff, len))); //CRYPTOLOG(" -> "<<crypto::hex(std::string((char*)buff, len)));
return std::string((char*)buff, len); return std::string((char*)buff, len);