Select card

Author: metsma

client/QCNG.cpp

@@ -23,6 +23,7 @@
 #include "SslCertificate.h"
 #include "TokenData.h"
 
+#include <QtCore/QUuid>
 #include <QtCore/QLoggingCategory>
 #include <QtNetwork/QSslKey>
 
@@ -220,7 +221,8 @@ QList<TokenData> QCNG::tokens() const
 				if(QByteArray tmp = prop(key, NCRYPT_READER_PROPERTY); !tmp.isEmpty())
 					reader = QString::fromUtf16((const char16_t*)tmp.data());
 			}
-			QString guid = prop(h, NCRYPT_SMARTCARD_GUID_PROPERTY).trimmed();
+			QByteArray guidData = prop(h, NCRYPT_SMARTCARD_GUID_PROPERTY);
+			QString guid = guidData[0] >= 0x20 && guidData[0] < 0x7F ? guidData.trimmed() : QUuid(*((GUID*)guidData.data())).toString(QUuid::WithBraces);
 			TokenData &t = result.emplaceBack();
 			t.setReader(reader);
 			t.setCard(cert.type() & SslCertificate::EstEidType || cert.type() & SslCertificate::DigiIDType ?
@@ -232,7 +234,8 @@ QList<TokenData> QCNG::tokens() const
 			qCWarning(CNG) << "key" << t.data(u"provider"_s)
 				<< "spec" << t.data(u"spec"_s)
 				<< "alg" << QStringView(keyname->pszAlgid)
-				<< "flags" << keyname->dwFlags;
+				<< "flags" << keyname->dwFlags
+				<< t.card();
 			if(cert.publicKey().algorithm() != QSsl::Rsa || reader.isEmpty())
 				continue;
 

client/QSigner.cpp

@@ -150,42 +150,6 @@ QSigner::~QSigner()
 
 QList<TokenData> QSigner::cache() const { return d->cache; }
 
-bool QSigner::cardsOrder(const TokenData &s1, const TokenData &s2)
-{
-	static auto cardsOrderScore = [](QChar c) -> quint8 {
-		switch(c.toLatin1())
-		{
-		case 'N': return 6;
-		case 'A': return 5;
-		case 'P': return 4;
-		case 'E': return 3;
-		case 'F': return 2;
-		case 'B': return 1;
-		default: return 0;
-		}
-	};
-	static const QRegularExpression reg(QStringLiteral("(\\w{1,2})(\\d{7})"));
-	QRegularExpressionMatch r1 = reg.match(s1.card());
-	QRegularExpressionMatch r2 = reg.match(s2.card());
-	if(r1.hasMatch() || r2.hasMatch())
-		return false;
-	QStringList cap1 = r1.capturedTexts();
-	QStringList cap2 = r1.capturedTexts();
-	if(cap1.isEmpty() || cap2.isEmpty())
-		return false;
-	// new cards to front
-	if(cap1[1].size() != cap2[1].size())
-		return cap1[1].size() > cap2[1].size();
-	// card type order
-	if(cap1[1][0] != cap2[1][0])
-		return cardsOrderScore(cap1[1][0]) > cardsOrderScore(cap2[1][0]);
-	// card version order
-	if(cap1[1].size() > 1 && cap2[1].size() > 1 && cap1[1][1] != cap2[1][1])
-		return cap1[1][1] > cap2[1][1];
-	// serial number order
-	return cap1[2].toUInt() > cap2[2].toUInt();
-}
-
 X509Cert QSigner::cert() const
 {
 	if( d->sign.cert().isNull() )
@@ -322,7 +286,6 @@ void QSigner::run()
 
 			QList<TokenData> acards, scards;
 			QList<TokenData> cache = d->backend->tokens();
-			std::sort(cache.begin(), cache.end(), cardsOrder);
 			if(cache != d->cache)
 			{
 				d->cache = std::move(cache);

client/QSigner.h

@@ -58,7 +58,6 @@ class QSigner final: public QThread, public digidoc::Signer
 	void error( const QString &msg );
 
 private:
-	static bool cardsOrder(const TokenData &s1, const TokenData &s2);
 	quint8 login(const TokenData &cert) const;
 	static QCryptographicHash::Algorithm methodToNID(const std::string &method);
 	void run() final;

client/TokenData.cpp

@@ -58,8 +58,6 @@ bool TokenData::isNull() const {
 TokenData& TokenData::operator =( const TokenData &other ) = default;
 TokenData& TokenData::operator =(TokenData &&other) Q_DECL_NOEXCEPT = default;
 
-bool TokenData::operator !=( const TokenData &other ) const { return !(operator==(other)); }
-
 bool TokenData::operator ==( const TokenData &other ) const
 {
 	return d == other.d || (

client/TokenData.h

@@ -48,7 +48,6 @@ class TokenData
 
 	TokenData& operator =( const TokenData &other );
 	TokenData& operator =(TokenData &&other) Q_DECL_NOEXCEPT;
-	bool operator !=( const TokenData &other ) const;
 	bool operator ==( const TokenData &other ) const;
 
 private: