libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fixed wrong calculation of max pin len; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-04-04 11:27:08 +00:00
parent 8e16b09839
commit 4092176786
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptoki.hxx
View File

@@ -1045,7 +1045,7 @@ namespace cryptoki {
hardwareVersion(cInfo.hardwareVersion), hardwareVersion(cInfo.hardwareVersion),
firmwareVersion(cInfo.firmwareVersion), firmwareVersion(cInfo.firmwareVersion),
utcTime(cInfo.utcTime) { utcTime(cInfo.utcTime) {
CRYPTOLOG("log *this={"<<std::endl<<*this);//<<std::endl<<'}'); CRYPTOLOG("log *this={"<<*this<<'}');
} }
}; };
@@ -2139,7 +2139,6 @@ namespace cryptoki {
attrs.push_back(CKA_VENDOR_DEFINED); attrs.push_back(CKA_VENDOR_DEFINED);
//attrs.push_back(CKA_IBM_OPAQUE); //attrs.push_back(CKA_IBM_OPAQUE);
} }
CK_ATTRIBUTE attr;
for (AttributeTypeList::const_iterator it(attrs.begin()); for (AttributeTypeList::const_iterator it(attrs.begin());
it!=attrs.end(); ++it) { it!=attrs.end(); ++it) {
CK_ATTRIBUTE attr; CK_ATTRIBUTE attr;

3
src/suisseid.hxx
View File

@@ -316,7 +316,7 @@ namespace suisseid {
/// @copydoc Card::Card /// @copydoc Card::Card
Post(std::shared_ptr<pcsc::Connection::Reader> reader, Post(std::shared_ptr<pcsc::Connection::Reader> reader,
const cryptoki::Library& cryptoki): const cryptoki::Library& cryptoki):
Card(reader, cryptoki), _minPinLen(0), _maxPinLen(0) { Card(reader, cryptoki), _minPinLen(0), _maxPinLen((unsigned int)-1) {
} }
virtual unsigned int minimalPinLength() { virtual unsigned int minimalPinLength() {
@@ -361,6 +361,7 @@ namespace suisseid {
private: private:
void evaluatePinLengths() { void evaluatePinLengths() {
CRYPTOLOG("log");
pcsc::Connection::Reader::Transaction lock(_reader); pcsc::Connection::Reader::Transaction lock(_reader);
selectPkcs15File("4408"); selectPkcs15File("4408");
cardos::BerValues res(readBerFile()); cardos::BerValues res(readBerFile());