Attachment #2715 for bug #2702

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2702
Collapse All | Expand All




	m_dialogPrevX(0),
	m_dialogPrevY(0),
	m_notifyReadyRequested(false),
#ifdef __TDE_HAVE_TDEHWLIB
	m_loginCardDevice(NULL),
#endif
	m_maskWidget(NULL),
	m_saverRootWindow(0)
{

	}

	// Initialize SmartCard readers
#ifdef __TDE_HAVE_TDEHWLIB
	TDEGenericDevice *hwdevice;
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);

		cdevice->enableCardMonitoring(true);
		// cdevice->enablePINEntryCallbacks(true);
	}
#endif

#ifdef KEEP_MOUSE_UNGRABBED
	setEnabled(false);

	}
}

#ifdef __TDE_HAVE_TDEHWLIB
void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
	TQString login_name = TQString::null;
	X509CertificatePtrList certList = cdevice->cardX509Certificates();

TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {
	return m_loginCardDevice;
}
#endif

void LockProcess::fullyOnline() {
	if (!mFullyOnlineSent) {





#include <ksslcertificate.h>

#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
#endif

#include <kgreeterplugin.h>


		void msgBox( TQMessageBox::Icon type, const TQString &txt );
		int execDialog( TQDialog* dlg );

#ifdef __TDE_HAVE_TDEHWLIB
		TDECryptographicCardDevice* cryptographicCardDevice();
#endif

	signals:
		void terminateHelperThread();

		void startSecureDialog();
		void slotMouseActivity(XEvent *event);
		void processInputPipeCommand(TQString command);
#ifdef __TDE_HAVE_TDEHWLIB
		void cryptographicCardInserted(TDECryptographicCardDevice*);
		void cryptographicCardRemoved(TDECryptographicCardDevice*);
		void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
		void signalPassDlgToAttemptCardLogin();
		void signalPassDlgToAttemptCardAbort();
#endif

	private:
		void configure();

		int m_dialogPrevY;

		bool m_notifyReadyRequested;
#ifdef __TDE_HAVE_TDEHWLIB
		TDECryptographicCardDevice* m_loginCardDevice;
#endif

		TQWidget* m_maskWidget;
		Window m_saverRootWindow;





#include <ksslcertificate.h>

#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
#endif

#include <kstandarddirs.h>
#include <tdeapplication.h>

	pthread_sigmask(SIG_BLOCK, &mThreadBlockSet, NULL);

	// Initialize SmartCard readers
#ifdef __TDE_HAVE_TDEHWLIB
	TDEGenericDevice *hwdevice;
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);

		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
		cdevice->enableCardMonitoring(true);
	}
#endif

	// Check card login status
	KUser userinfo;


void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
	TQString login_name = TQString::null;
#ifdef __TDE_HAVE_TDEHWLIB
	X509CertificatePtrList certList = cdevice->cardX509Certificates();
	if (certList.count() > 0) {
		KSSLCertificate* card_cert = NULL;

			mValidCryptoCardInserted = true;
		}
	}
#endif
}

void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {

Return to bug 2702

Lines 228-234 LockProcess::LockProcess() Link Here

(-)a/kdesktop/lock/lockprocess.cc (+6 lines)
228	m_dialogPrevX(0),	228	m_dialogPrevX(0),
229	m_dialogPrevY(0),	229	m_dialogPrevY(0),
230	m_notifyReadyRequested(false),	230	m_notifyReadyRequested(false),
		231	#ifdef __TDE_HAVE_TDEHWLIB
231	m_loginCardDevice(NULL),	232	m_loginCardDevice(NULL),
		233	#endif
232	m_maskWidget(NULL),	234	m_maskWidget(NULL),
233	m_saverRootWindow(0)	235	m_saverRootWindow(0)
234	{	236	{
Lines 295-300 LockProcess::LockProcess() Link Here
295	}	297	}
296		298
297	// Initialize SmartCard readers	299	// Initialize SmartCard readers
		300	#ifdef __TDE_HAVE_TDEHWLIB
298	TDEGenericDevice *hwdevice;	301	TDEGenericDevice *hwdevice;
299	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	302	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
300	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);	303	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
Lines 306-311 LockProcess::LockProcess() Link Here
306	cdevice->enableCardMonitoring(true);	309	cdevice->enableCardMonitoring(true);
307	// cdevice->enablePINEntryCallbacks(true);	310	// cdevice->enablePINEntryCallbacks(true);
308	}	311	}
		312	#endif
309		313
310	#ifdef KEEP_MOUSE_UNGRABBED	314	#ifdef KEEP_MOUSE_UNGRABBED
311	setEnabled(false);	315	setEnabled(false);
Lines 2812-2817 void LockProcess::processInputPipeCommand(TQString inputcommand) { Link Here
2812	}	2816	}
2813	}	2817	}
2814		2818
		2819	#ifdef __TDE_HAVE_TDEHWLIB
2815	void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {	2820	void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
2816	TQString login_name = TQString::null;	2821	TQString login_name = TQString::null;
2817	X509CertificatePtrList certList = cdevice->cardX509Certificates();	2822	X509CertificatePtrList certList = cdevice->cardX509Certificates();
Lines 2906-2911 void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographi Link Here
2906	TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {	2911	TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {
2907	return m_loginCardDevice;	2912	return m_loginCardDevice;
2908	}	2913	}
		2914	#endif
2909		2915
2910	void LockProcess::fullyOnline() {	2916	void LockProcess::fullyOnline() {
2911	if (!mFullyOnlineSent) {	2917	if (!mFullyOnlineSent) {

Lines 12-19 Link Here

(-)a/kdesktop/lock/lockprocess.h (+8 lines)
12		12
13	#include <ksslcertificate.h>	13	#include <ksslcertificate.h>
14		14
		15	#ifdef __TDE_HAVE_TDEHWLIB
15	#include <tdehardwaredevices.h>	16	#include <tdehardwaredevices.h>
16	#include <tdecryptographiccarddevice.h>	17	#include <tdecryptographiccarddevice.h>
		18	#endif
17		19
18	#include <kgreeterplugin.h>	20	#include <kgreeterplugin.h>
19		21
Lines 105-111 class LockProcess : public TQWidget Link Here
105	void msgBox( TQMessageBox::Icon type, const TQString &txt );	107	void msgBox( TQMessageBox::Icon type, const TQString &txt );
106	int execDialog( TQDialog* dlg );	108	int execDialog( TQDialog* dlg );
107		109
		110	#ifdef __TDE_HAVE_TDEHWLIB
108	TDECryptographicCardDevice* cryptographicCardDevice();	111	TDECryptographicCardDevice* cryptographicCardDevice();
		112	#endif
109		113
110	signals:	114	signals:
111	void terminateHelperThread();	115	void terminateHelperThread();
Lines 141-151 class LockProcess : public TQWidget Link Here
141	void startSecureDialog();	145	void startSecureDialog();
142	void slotMouseActivity(XEvent *event);	146	void slotMouseActivity(XEvent *event);
143	void processInputPipeCommand(TQString command);	147	void processInputPipeCommand(TQString command);
		148	#ifdef __TDE_HAVE_TDEHWLIB
144	void cryptographicCardInserted(TDECryptographicCardDevice*);	149	void cryptographicCardInserted(TDECryptographicCardDevice*);
145	void cryptographicCardRemoved(TDECryptographicCardDevice*);	150	void cryptographicCardRemoved(TDECryptographicCardDevice*);
146	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);	151	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
147	void signalPassDlgToAttemptCardLogin();	152	void signalPassDlgToAttemptCardLogin();
148	void signalPassDlgToAttemptCardAbort();	153	void signalPassDlgToAttemptCardAbort();
		154	#endif
149		155
150	private:	156	private:
151	void configure();	157	void configure();
Lines 267-273 class LockProcess : public TQWidget Link Here
267	int m_dialogPrevY;	273	int m_dialogPrevY;
268		274
269	bool m_notifyReadyRequested;	275	bool m_notifyReadyRequested;
		276	#ifdef __TDE_HAVE_TDEHWLIB
270	TDECryptographicCardDevice* m_loginCardDevice;	277	TDECryptographicCardDevice* m_loginCardDevice;
		278	#endif
271		279
272	TQWidget* m_maskWidget;	280	TQWidget* m_maskWidget;
273	Window m_saverRootWindow;	281	Window m_saverRootWindow;

Lines 13-20 Link Here

(-)a/kdesktop/lockeng.cc (+6 lines)
13		13
14	#include <ksslcertificate.h>	14	#include <ksslcertificate.h>
15		15
		16	#ifdef __TDE_HAVE_TDEHWLIB
16	#include <tdehardwaredevices.h>	17	#include <tdehardwaredevices.h>
17	#include <tdecryptographiccarddevice.h>	18	#include <tdecryptographiccarddevice.h>
		19	#endif
18		20
19	#include <kstandarddirs.h>	21	#include <kstandarddirs.h>
20	#include <tdeapplication.h>	22	#include <tdeapplication.h>
Lines 166-171 SaverEngine::SaverEngine() Link Here
166	pthread_sigmask(SIG_BLOCK, &mThreadBlockSet, NULL);	168	pthread_sigmask(SIG_BLOCK, &mThreadBlockSet, NULL);
167		169
168	// Initialize SmartCard readers	170	// Initialize SmartCard readers
		171	#ifdef __TDE_HAVE_TDEHWLIB
169	TDEGenericDevice *hwdevice;	172	TDEGenericDevice *hwdevice;
170	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	173	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
171	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);	174	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
Lines 175-180 SaverEngine::SaverEngine() Link Here
175	connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice)));	178	connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice)));
176	cdevice->enableCardMonitoring(true);	179	cdevice->enableCardMonitoring(true);
177	}	180	}
		181	#endif
178		182
179	// Check card login status	183	// Check card login status
180	KUser userinfo;	184	KUser userinfo;
Lines 229-234 void SaverEngine::cardStartupTimeout() { Link Here
229		233
230	void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {	234	void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
231	TQString login_name = TQString::null;	235	TQString login_name = TQString::null;
		236	#ifdef __TDE_HAVE_TDEHWLIB
232	X509CertificatePtrList certList = cdevice->cardX509Certificates();	237	X509CertificatePtrList certList = cdevice->cardX509Certificates();
233	if (certList.count() > 0) {	238	if (certList.count() > 0) {
234	KSSLCertificate* card_cert = NULL;	239	KSSLCertificate* card_cert = NULL;
Lines 249-254 void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) Link Here
249	mValidCryptoCardInserted = true;	254	mValidCryptoCardInserted = true;
250	}	255	}
251	}	256	}
		257	#endif
252	}	258	}
253		259
254	void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {	260	void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {