Fix reading certificate with some readers

IB-8468

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

client/QSmartCard.cpp

@@ -127,6 +127,8 @@ QHash<quint8,QByteArray> Card::parseFCI(const QByteArray &data)
 const QByteArray IDEMIACard::AID = APDU("00A4040C 10 A000000077010800070000FE00000100");
 const QByteArray IDEMIACard::AID_OT = APDU("00A4040C 0D E828BD080FF2504F5420415750");
 const QByteArray IDEMIACard::AID_QSCD = APDU("00A4040C 10 51534344204170706C69636174696F6E");
+const QByteArray IDEMIACard::ATR_COSMO8 = QByteArrayLiteral("3BDB960080B1FE451F830012233F536549440F9000F1");
+const QByteArray IDEMIACard::ATR_COSMOX = QByteArrayLiteral("3BDC960080B1FE451F830012233F54654944320F9000C3");
 
 QPCSCReader::Result IDEMIACard::change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin_, const QString &newpin_) const
 {
@@ -153,8 +155,7 @@ QPCSCReader::Result IDEMIACard::change(QPCSCReader *reader, QSmartCardData::PinT
 
 bool IDEMIACard::isSupported(const QByteArray &atr)
 {
-	return atr == "3BDB960080B1FE451F830012233F536549440F9000F1" ||
-		atr == "3BDC960080B1FE451F830012233F54654944320F9000C3";
+	return atr == ATR_COSMO8 || atr == ATR_COSMOX;
 }
 
 bool IDEMIACard::loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const
@@ -203,10 +204,15 @@ bool IDEMIACard::loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const
 			return QSslCertificate();
 		QByteArray cert;
 		QByteArray cmd = READBINARY;
+		int maxLe = 0;
+		if(reader->atr() == ATR_COSMOX)
+			maxLe = 0xC0;
 		for(int size = quint8(fci[0x80][0]) << 8 | quint8(fci[0x80][1]); cert.size() < size; )
 		{
 			cmd[2] = char(cert.size() >> 8);
 			cmd[3] = char(cert.size());
+			if(maxLe != 0)
+				cmd[4] = char(std::min<int>(size - cert.size(), maxLe));
 			data = reader->transfer(cmd);
 			if(!data)
 				return QSslCertificate();

client/QSmartCard_p.h

@@ -61,7 +61,7 @@ class IDEMIACard: public Card
 	static bool isSupported(const QByteArray &atr);
 	static QByteArray pinTemplate(const QString &pin);
 
-	static const QByteArray AID, AID_OT, AID_QSCD;
+	static const QByteArray AID, AID_OT, AID_QSCD, ATR_COSMO8, ATR_COSMOX;
 };
 
 class QSmartCard::Private