summaryrefslogtreecommitdiff
authorclem <clem>2004-08-03 22:59:45 (UTC)
committer clem <clem>2004-08-03 22:59:45 (UTC)
commit72d6b839da4aecba0ad6479c3e1d68192bbe6a51 (patch) (side-by-side diff)
tree1a60581005dfab811debe87e2eae6be905743dc2
parent02434fe2d87d1c69c60693d9537b419d9dfd44e7 (diff)
downloadopie-72d6b839da4aecba0ad6479c3e1d68192bbe6a51.zip
opie-72d6b839da4aecba0ad6479c3e1d68192bbe6a51.tar.gz
opie-72d6b839da4aecba0ad6479c3e1d68192bbe6a51.tar.bz2
manage better the MultiauthConfigWidget PinConfigWidget object, with a pointer managed by PinPlugin c'tor and d'tor (like in NoticePlugin)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/securityplugins/pin/pin.cpp22
-rw-r--r--noncore/securityplugins/pin/pin.h3
2 files changed, 19 insertions, 6 deletions
diff --git a/noncore/securityplugins/pin/pin.cpp b/noncore/securityplugins/pin/pin.cpp
index c21ffcd..2accb9c 100644
--- a/noncore/securityplugins/pin/pin.cpp
+++ b/noncore/securityplugins/pin/pin.cpp
@@ -10,33 +10,32 @@
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "pin.h"
#include "pinDialogBase.h"
-#include "pinConfigWidget.h"
/* OPIE */
#include <opie2/odebug.h>
#include <opie2/oapplication.h>
/* QT */
#include <qpe/config.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qtextview.h>
#include <qstring.h>
#include <qdialog.h>
/* UNIX */
#include <unistd.h>
#include <stdlib.h>
#include <time.h>
extern "C" char *crypt(const char *key, const char *salt);
@@ -305,41 +304,52 @@ int PinPlugin::authenticate()
PinDlg pd(0,0,TRUE,TRUE);
pd.reset();
pd.exec();
// analyse the result
if (isSkip == TRUE)
return MultiauthPluginObject::Skip;
else if (verify(pd.pinD->text, hashedPin))
return MultiauthPluginObject::Success;
else
return MultiauthPluginObject::Failure;
}
owarn << "No PIN has been defined! We consider it as a successful authentication though." << oendl;
return MultiauthPluginObject::Success;
}
+/// Standard c'tor
+PinPlugin::PinPlugin() : MultiauthPluginObject(), m_pinW(0) {
+}
+
+/// deletes m_pinW if we need to
+PinPlugin::~PinPlugin() {
+ if (m_pinW != 0)
+ delete m_pinW;
+}
+
/// Simply returns the plugin name (PIN plugin)
QString PinPlugin::pluginName() const {
return "PIN Plugin";
}
QString PinPlugin::pixmapNameWidget() const {
return "security/pinplugin";
}
QString PinPlugin::pixmapNameConfig() const {
return "security/pinplugin";
}
/// returns a PinConfigWidget
MultiauthConfigWidget * PinPlugin::configWidget(QWidget * parent) {
- PinConfigWidget * pinw = new PinConfigWidget(parent, "PIN configuration widget");
-
- connect(pinw->changePIN, SIGNAL( clicked() ), this, SLOT( changePIN() ));
- connect(pinw->clearPIN, SIGNAL( clicked() ), this, SLOT( clearPIN() ));
+ if (m_pinW == 0) {
+ m_pinW = new PinConfigWidget(parent, "PIN configuration widget");
- return pinw;
+ connect(m_pinW->changePIN, SIGNAL( clicked() ), this, SLOT( changePIN() ));
+ connect(m_pinW->clearPIN, SIGNAL( clicked() ), this, SLOT( clearPIN() ));
+ }
+ return m_pinW;
}
#include "pin.moc"
diff --git a/noncore/securityplugins/pin/pin.h b/noncore/securityplugins/pin/pin.h
index 1832210..b5ae10a 100644
--- a/noncore/securityplugins/pin/pin.h
+++ b/noncore/securityplugins/pin/pin.h
@@ -35,34 +35,37 @@
#define PIN_H
#include <qobject.h>
#include <qstring.h>
#include <opie2/multiauthplugininterface.h>
#include "pinConfigWidget.h"
/// Multi-authentication plugin, implementing a PIN verification.
/**
* The plugin itself, implementing the main authenticate() function.
*/
class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
Q_OBJECT
public:
+ PinPlugin();
+ virtual ~PinPlugin();
int authenticate();
Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
QString pixmapNameConfig() const;
QString pixmapNameWidget() const;
QString pluginName() const;
private slots:
QString getPIN( const QString& prompt );
QString getCryptedPIN( const QString& prompt );
void changePIN();
void clearPIN();
private:
+ PinConfigWidget * m_pinW;
QString encrypt(const QString& pin);
bool verify(const QString& pin, const QString& hash);
};
#endif // PIN_H