|
|
@ -73,7 +73,6 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#include <boost/shared_ptr.hpp> |
|
|
|
|
|
|
|
#include <vector> |
|
|
|
#include <vector> |
|
|
|
#include <map> |
|
|
|
#include <map> |
|
|
|
#include <memory> |
|
|
|
#include <memory> |
|
|
@ -257,7 +256,6 @@ namespace pcsc { |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
assert(claInsP1P2.size()==4); |
|
|
|
|
|
|
|
return transmit(claInsP1P2, lc, le); |
|
|
|
return transmit(claInsP1P2, lc, le); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -270,7 +268,6 @@ namespace pcsc { |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
assert(claInsP1P2.size()==4); |
|
|
|
|
|
|
|
return transmit(claInsP1P2, std::string(), le); |
|
|
|
return transmit(claInsP1P2, std::string(), le); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -284,7 +281,6 @@ namespace pcsc { |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(ins); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p1); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
claInsP1P2.push_back(p2); |
|
|
|
assert(claInsP1P2.size()==4); |
|
|
|
|
|
|
|
return transmit(claInsP1P2, std::string(lc, len), le); |
|
|
|
return transmit(claInsP1P2, std::string(lc, len), le); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -523,7 +519,9 @@ namespace pcsc { |
|
|
|
connection to the reader, then access it. */ |
|
|
|
connection to the reader, then access it. */ |
|
|
|
Reader& reader(const std::string& name) { |
|
|
|
Reader& reader(const std::string& name) { |
|
|
|
if (_reader.find(name)==_reader.end()) |
|
|
|
if (_reader.find(name)==_reader.end()) |
|
|
|
_reader.insert(std::make_pair(name, new Reader(name, *this))); |
|
|
|
_reader.insert |
|
|
|
|
|
|
|
(std::make_pair |
|
|
|
|
|
|
|
(name, std::shared_ptr<Reader>(new Reader(name, *this)))); |
|
|
|
return *_reader.find(name)->second; |
|
|
|
return *_reader.find(name)->second; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -832,7 +830,7 @@ namespace pcsc { |
|
|
|
bool _exc; |
|
|
|
bool _exc; |
|
|
|
SCARDCONTEXT _id; |
|
|
|
SCARDCONTEXT _id; |
|
|
|
long _state; |
|
|
|
long _state; |
|
|
|
std::map<std::string, boost::shared_ptr<Reader> > _reader; |
|
|
|
std::map<std::string, std::shared_ptr<Reader> > _reader; |
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|