Make cryptographic card reader detection on single readers sytems more robust

pull/1/head
Timothy Pearson 8 years ago
parent 2872549499
commit 125cf0a7f2

@ -171,10 +171,17 @@ void CryptoCardDeviceWatcher::run() {
SCardDisconnect(hCard, SCARD_LEAVE_CARD); SCardDisconnect(hCard, SCARD_LEAVE_CARD);
} }
if (!readers[i].contains(cardDevice->friendlyName())) { /* FIXME
if (!cardDevice->friendlyName().contains(reader_vendor_name) || * If only one reader was detected by PCSC, assume it corresponds to the current device node.
((reader_interface_type != "") && !cardDevice->friendlyName().contains(reader_vendor_name))) { * This is fragile, but avoids corner cases with common systems failing to work due to
continue; * mismatched udev / PCSC card reader vendor names...
*/
if (readers.count() > 1) {
if (!readers[i].contains(cardDevice->friendlyName())) {
if (!cardDevice->friendlyName().contains(reader_vendor_name) ||
((reader_interface_type != "") && !cardDevice->friendlyName().contains(reader_vendor_name))) {
continue;
}
} }
} }

Loading…
Cancel
Save