libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

workaround Mac OS X 10.10 PCSC bug; refs #34

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-11-11 13:56:21 +00:00
parent 0b4837d185
commit c871e3b2eb
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/pcsc.hxx
View File

@@ -141,7 +141,7 @@ namespace pcsc {
//! @addtogroup pcsclib
//@{
//============================================================================
class Connection {
@@ -306,11 +306,32 @@ namespace pcsc {
rPci.cbPciLength = sizeof(rPci);
// log only in verbose debuggung; could log pins
CRYPTOLOG_VERBOSE("SCardTransmit: "<<crypto::hex(in));
check(SCardTransmit(_id, &rPci,
(LPCBYTE)in.c_str(),
in.size(),
0, buff, &len),
"smartcard transmit message "+crypto::hex(in));
try {
check(SCardTransmit(_id, &rPci,
(LPCBYTE)in.c_str(),
in.size(),
0, buff, &len),
"smartcard transmit message "+crypto::hex(in));
} catch (...) {
// try to fix Apple's Mac OS X 10.10 implementation bug
# ifdef __APPLE__
/*! @bug Work around Mac OSX 10.10 bug. On Mac OSX
10.10 there is a bug in PCSC: After a
reconnect, first transaction (SCardTransmit)
fails with SCARD_W_RESET_CARD
(0x80100068). */
if (_status==SCARD_W_RESET_CARD) { // just resend once
check(SCardTransmit(_id, &rPci,
(LPCBYTE)in.c_str(),
in.size(),
0, buff, &len),
"smartcard transmit message "+crypto::hex(in));
continue; // this time: success
}
# else
throw; // just rethrow otherwise
# endif
}
//CRYPTOLOG(" -> "<<crypto::hex(std::string((char*)buff, len)));
return std::string((char*)buff, len);
}