From d9d0f2875fb7ed47a8f3d3c6f03bd1ff12878eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 10 Oct 2013 09:13:19 +0000
Subject: [PATCH] functions to scan specific cards; refs #28

---
 src/cryptoki.cxx |  8 ++++++--
 src/cryptoki.hxx |  3 ++-
 src/pcsc.hxx     | 13 +++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/cryptoki.cxx b/src/cryptoki.cxx
index 01ad8c0..fd2b8a9 100644
--- a/src/cryptoki.cxx
+++ b/src/cryptoki.cxx
@@ -200,7 +200,7 @@ namespace cryptoki {
           }
           @endcode */
         
-  SlotList Init::slotList(bool tokenPresent) {
+      SlotList Init::slotList(bool tokenPresent, std::string name) {
     CRYPTOKI_LOG("log");
     SlotList res;
     CK_ULONG count(0);
@@ -217,7 +217,11 @@ namespace cryptoki {
       } while (_res==CKR_BUFFER_TOO_SMALL);
       check(_res, CRYPTOKI_FN_LOG("C_GetSlotList"));
       if (!*this) return res;
-      for (CK_ULONG i(0); i<count; ++i) res.push_back(Slot(*this, slots[i]));
+      for (CK_ULONG i(0); i<count; ++i) {
+        Slot s(*this, slots[i]);
+        if (!name.size() || name==s.slotInfo().slotDescription)
+          res.push_back(s);
+      }
     } catch (...) {
       delete[] slots;
       throw;
diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx
index c21c807..d2cd354 100644
--- a/src/cryptoki.hxx
+++ b/src/cryptoki.hxx
@@ -706,8 +706,9 @@ namespace cryptoki {
         
       //! Get a list of available slots
       /*! @param tokenPresent whether a token must be inserted into the reader
+          @param name if given, only return slots with a given name
           @return list of matching slots */
-      SlotList slotList(bool tokenPresent=true);
+      SlotList slotList(bool tokenPresent=true, std::string name=std::string());
       
   };
 
diff --git a/src/pcsc.hxx b/src/pcsc.hxx
index f66c586..07a3d60 100644
--- a/src/pcsc.hxx
+++ b/src/pcsc.hxx
@@ -547,6 +547,19 @@ namespace pcsc {
       void close(const std::string& s) {
         
       }
+      
+      //! Find all readers with a given ATR.
+      /*! @param atr full or partial ATR to match to the reader's ATR
+          @returns list of readers that contain @c atr in their ATR */
+      Strings getReadersWithAtr(const std::string& atr) {
+        Strings res;
+        pcsc::Connection::Strings readers(scan());
+        for (pcsc::Connection::Strings::const_iterator it(readers.begin());
+             it!=readers.end(); ++it)
+          if (_reader[*it].status().atr.find(atr)!=string::npos)
+            res.push_back(*it);
+        return res;
+      }
 
       //! @c false if last operation was not successful
       operator bool() const {