Fix Personal data read (open-eid#1201)

IB-7750, IB-7540 Signed-off-by: Raul Metsma <[email protected]>
metsma · Jul 7, 2023 · b9d99c1 · b9d99c1
1 parent 608feee
commit b9d99c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/QPKCS11.cpp b/client/QPKCS11.cpp
@@ -32,7 +32,7 @@
 template<class Container>
 QString toQString(const Container &c)
 {
-	return QString::fromLatin1(QByteArray::fromRawData((const char*)std::data(c), std::size(c)).toUpper());
+	return QString::fromLatin1((const char*)std::data(c), std::size(c));
 }
 
 QByteArray QPKCS11::Private::attribute(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_TYPE type) const
@@ -177,7 +177,7 @@ bool QPKCS11::load( const QString &driver )
 		<< QStringLiteral("%1 (%2.%3)").arg(toQString(info.libraryDescription))
 			.arg(info.libraryVersion.major).arg(info.libraryVersion.minor) << '\n'
 		<< "Flags:" << info.flags;
-	d->isFinDriver = toQString(info.libraryDescription).contains(QLatin1String("MPOLLUX"));
+	d->isFinDriver = toQString(info.libraryDescription).contains(QLatin1String("MPOLLUX"), Qt::CaseInsensitive);
 	return true;
 }
 

diff --git a/client/widgets/VerifyCert.cpp b/client/widgets/VerifyCert.cpp
@@ -169,7 +169,7 @@ void VerifyCert::update()
 		ui->validUntil->setText(tr("The PUK code is located in your envelope"));
 		ui->validUntil->setHidden(isBlockedPuk);
 		ui->changePIN->setText(tr("CHANGE PUK"));
-		ui->changePIN->setHidden(cardData.version() == isBlockedPuk);
+		ui->changePIN->setHidden(isBlockedPuk);
 		ui->forgotPinLink->hide();
 		ui->details->hide();
 		ui->checkCert->hide();