more log; refs #34

master
Marc Wäckerlin 10 years ago
parent 4a0edda811
commit f3352be9e1
  1. 7
      src/cryptoki.cxx

@ -228,11 +228,13 @@ namespace cryptoki {
SlotList Library::slotList(bool tokenPresent, std::string name) { SlotList Library::slotList(bool tokenPresent, std::string name) {
CRYPTOLOG("log"); CRYPTOLOG("log");
CRYPTOLOG("looking for card name: ")<<name<<(tokenPresent?" with token":"");
SlotList res; SlotList res;
CK_ULONG count(0); CK_ULONG count(0);
//! calls @c C_GetSlotList //! calls @c C_GetSlotList
_init->check(_init->_fn->C_GetSlotList(tokenPresent?TRUE:FALSE, 0, &count), _init->check(_init->_fn->C_GetSlotList(tokenPresent?TRUE:FALSE, 0, &count),
CRYPTOKI_FN_LOG("C_GetSlotList")); CRYPTOKI_FN_LOG("C_GetSlotList"));
CRYPTOLOG("found ")<<count<<" readers, result: "<<(*this?"success":"error");
if (!count || !*this) return res; if (!count || !*this) return res;
CK_SLOT_ID* slots = 0; CK_SLOT_ID* slots = 0;
try { try {
@ -246,9 +248,12 @@ namespace cryptoki {
if (!*this) return res; if (!*this) return res;
for (CK_ULONG i(0); i<count; ++i) { for (CK_ULONG i(0); i<count; ++i) {
Slot s(*this, slots[i]); Slot s(*this, slots[i]);
if (!name.size() || name==s.slotinfo().slotDescription) CRYPTOLOG("found slot ")<<s.slotinfo().slotDescription;
if (!name.size() || name==s.slotinfo().slotDescription) {
CRYPTOLOG("-> slot matches");
res.push_back(s); res.push_back(s);
} }
}
} catch (...) { } catch (...) {
delete[] slots; delete[] slots;
throw; throw;

Loading…
Cancel
Save