Do not allow cancel in PinPad view and clean PIN memory (#1384)

IB-7082

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

Author: metsma

client/QPCSC.cpp

@@ -210,7 +210,13 @@ QPCSCReader::QPCSCReader( const QString &reader, QPCSC *parent )
 		SC(GetStatusChange, d->d->context, 0, &d->state, 1U);
 }
 
-QPCSCReader::~QPCSCReader()
+QPCSCReader::QPCSCReader(QPCSCReader &&other) noexcept
+	: d(other.d)
+{
+	other.d = new Private;
+}
+
+QPCSCReader::~QPCSCReader() noexcept
 {
 	if(d->isTransacted)
 		SC(EndTransaction, d->card, SCARD_LEAVE_CARD);

client/QPCSC.h

@@ -97,7 +97,8 @@ class QPCSCReader final: public QObject
 	};
 
 	explicit QPCSCReader( const QString &reader, QPCSC *parent );
-	~QPCSCReader() final;
+	QPCSCReader(QPCSCReader &&) noexcept;
+	~QPCSCReader() noexcept final;
 
 	QByteArray atr() const;
 	bool isPinPad() const;

client/QPKCS11.cpp

@@ -24,12 +24,12 @@
 #include "QPCSC.h"
 #include "SslCertificate.h"
 #include "TokenData.h"
+#include "Utils.h"
 #include "dialogs/PinPopup.h"
 
 #include <QtCore/QDebug>
 
 #include <array>
-#include <thread>
 
 template<class Container>
 static QString toQString(const Container &c)
@@ -222,12 +222,10 @@ QPKCS11::PinStatus QPKCS11::login(const TokenData &t)
 	{
 		f |= PinPopup::PinpadFlag;
 		PinPopup p(isSign ? QSmartCardData::Pin2Type : QSmartCardData::Pin1Type, f, cert, Application::mainWindow());
-		std::thread([&err, &p, this] {
-			emit p.startTimer();
-			err = d->f->C_Login(d->session, CKU_USER, nullptr, 0);
-			p.accept();
-		}).detach();
-		p.exec();
+		p.open();
+		p.startTimer();
+		err = waitFor(d->f->C_Login, d->session, CKU_USER, nullptr, 0);
+		p.accept();
 	}
 	else
 	{