crypto changes

2 files changed, 9 insertions, 4 deletions

diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 4c3a568..6aa0571 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -1,163 +1,168 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on
 
 
 TARGET		= pwmpi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY
 
 #enable this setting if you want debugoutput for pwmanager
 #DEFINES += CONFIG_DEBUG
-
+LIBS += -L../libcrypt/$(PLATFORM)
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokdepim
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
-LIBS += -lz
+LIBS += -lzlib
 #LIBS += -lbz2
-LIBS += -lgcrypt
+#LIBS += -lkpmicrogcrypt
+LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
+LIBS += -lkpmicrocipher
+LIBS += -lkpmicroerror
+LIBS += -lkpmicrompi
+LIBS += -lstdc++
 
 #INTERFACES = \
 #addentrywnd.ui \
 #configwnd.ui \
 #findwnd.ui \
 #getmasterpwwnd.ui \
 #pwgenwnd.ui \
 #setmasterpwwnd.ui \
 #subtbledit.ui
 
 #INTERFACES = \
 #subtbledit.ui \
 
 
 
 #HEADERS = \
 #configuration_31compat.h \
 #configuration.h \
 #configwnd.h \
 #configwndimpl.h \
 #selftest.h
 #subtbledit.h \
 #subtbleditimpl.h \
 #compressbzip2.h \
 
 HEADERS = \
 addentrywnd_emb.h \
 addentrywndimpl.h \
 base64.h \
 binentrygen.h \
 blowfish.h \
 commentbox.h \
 compiler.h \
 compressgzip.h \
 findwnd_emb.h \
 findwndimpl.h \
 genpasswd.h \
 getkeycardwnd.h \
 getmasterpwwnd_emb.h \
 getmasterpwwndimpl.h \
 globalstuff.h \
 gpasmanfile.h \
 htmlgen.h \
 htmlparse.h \
 ipc.h \
 libgcryptif.h \
 listobjselectwnd.h \
 listviewpwm.h \
 printtext.h \
 pwgenwnd_emb.h \
 pwgenwndimpl.h \
 pwmdoc.h \
 pwmdocui.h \
 pwmexception.h \
 pwm.h \
 pwminit.h \
 pwmprefs.h \
 pwmprint.h \
 pwmtray.h \
 pwmview.h \
 pwmviewstyle_0.h \
 pwmviewstyle_1.h \
 pwmviewstyle.h \
 randomizer.h \
 rc2.h \
 rencatwnd.h \
 serializer.h \
 setmasterpwwnd_emb.h \
 setmasterpwwndimpl.h \
 sha1.h \
 waitwnd.h \
 kcmconfigs/kcmpwmconfig.h \ 
 kcmconfigs/pwmconfigwidget.h
 
 #sources that need not be build
 #SOURCES = \
 #advcommeditimpl.cpp \
 #configuration.cpp \
 #configwnd.cpp \
 #configwndimpl.cpp \
 #configuration_31compat.cpp \
 #htmlparse.cpp \
 #printtext.cpp \
 #selftest.cpp \
 #pwmprint.cpp \
 #spinforsignal.cpp
 #subtbledit.cpp \
 #subtbleditimpl.cpp \
 #compressbzip2.cpp
  
 
 SOURCES = \
 addentrywnd_emb.cpp \
 addentrywndimpl.cpp \
 base64.cpp \
 binentrygen.cpp \
 blowfish.cpp \
 commentbox.cpp \
 compressgzip.cpp \
 findwnd_emb.cpp \
 findwndimpl.cpp \
 genpasswd.cpp \
 getkeycardwnd.cpp \
 getmasterpwwnd_emb.cpp \
 getmasterpwwndimpl.cpp \
 globalstuff.cpp \
 gpasmanfile.cpp \
 htmlgen.cpp \
 ipc.cpp \
 libgcryptif.cpp \
 listobjselectwnd.cpp \
 listviewpwm.cpp \
 main.cpp \
 pwgenwnd_emb.cpp \
 pwgenwndimpl.cpp \
 pwm.cpp \
 pwmdoc.cpp \
 pwmdocui.cpp \
 pwmexception.cpp \
 pwminit.cpp \
 pwmprefs.cpp \
 pwmtray.cpp \
 pwmview.cpp \
 pwmviewstyle_0.cpp \
 pwmviewstyle_1.cpp \
 pwmviewstyle.cpp \
 randomizer.cpp \
 rc2.cpp \
 rencatwnd.cpp \
 serializer.cpp \
 setmasterpwwnd_emb.cpp \
 setmasterpwwndimpl.cpp \
 sha1.cpp \
 waitwnd.cpp \
 kcmconfigs/kcmpwmconfig.cpp \ 
 kcmconfigs/pwmconfigwidget.cpp
 
 
 
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index f4a1636..e29e3d1 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -157,385 +157,385 @@ DocTimer::DocTimer(PwMDoc *_doc)
 	connect(autoLockTimer, SIGNAL(timeout()),
 		this, SLOT(autoLockTimeout()));
 	connect(metaCheckTimer, SIGNAL(timeout()),
 		this, SLOT(metaCheckTimeout()));
 }
 
 DocTimer::~DocTimer()
 {
 	delete mpwTimer;
 	delete autoLockTimer;
 	delete metaCheckTimer;
 }
 
 void DocTimer::start(TimerIDs timer)
 {
 	switch (timer) {
 		case id_mpwTimer:
 			if (mpwTimer->isActive())
 				mpwTimer->stop();
 			doc->setDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW);
 			mpwTimer->start(conf()->confGlobPwTimeout() * 1000, true);
 			break;
 		case id_autoLockTimer:
 			if (autoLockTimer->isActive())
 				autoLockTimer->stop();
 			if (conf()->confGlobLockTimeout() > 0)
 				autoLockTimer->start(conf()->confGlobLockTimeout() * 1000, true);
 			break;
 		case id_metaCheckTimer:
 			if (metaCheckTimer->isActive())
 				metaCheckTimer->stop();
 			metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true);
 			break;
 	}
 }
 
 void DocTimer::stop(TimerIDs timer)
 {
 	switch (timer) {
 		case id_mpwTimer:
 			mpwTimer->stop();
 			break;
 		case id_autoLockTimer:
 			autoLockTimer->stop();
 			break;
 		case id_metaCheckTimer:
 			metaCheckTimer->stop();
 			break;
 	}
 }
 
 void DocTimer::getLock(TimerIDs timer)
 {
 	switch (timer) {
 		case id_mpwTimer:
 			++mpwLock;
 			break;
 		case id_autoLockTimer:
 			++autoLockLock;
 			break;
 		case id_metaCheckTimer:
 			++metaCheckLock;
 			break;
 	}
 }
 
 void DocTimer::putLock(TimerIDs timer)
 {
 	switch (timer) {
 		case id_mpwTimer:
 			if (mpwLock)
 				--mpwLock;
 			break;
 		case id_autoLockTimer:
 			if (autoLockLock)
 				--autoLockLock;
 			break;
 		case id_metaCheckTimer:
 			if (metaCheckLock)
 				--metaCheckLock;
 			break;
 	}
 }
 
 void DocTimer::mpwTimeout()
 {
 	if (mpwLock) {
 		mpwTimer->start(1000, true);
 		return;
 	}
 	doc->unsetDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW);
 }
 
 void DocTimer::autoLockTimeout()
 {
 	if (autoLockLock) {
 		autoLockTimer->start(1000, true);
 		return;
 	}
 	if (conf()->confGlobAutoDeepLock() &&
 	    doc->filename != QString::null &&
 	    doc->filename != "") {
 		doc->deepLock(true);
 	} else {
 		doc->lockAll(true);
 	}
 }
 
 void DocTimer::metaCheckTimeout()
 {
 	if (metaCheckLock) {
 		// check again in one second.
 		metaCheckTimer->start(1000, true);
 		return;
 	}
 	if (doc->isDeepLocked()) {
 		metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true);
 		return;
 	}
 	if (doc->isDocEmpty()) {
 		metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true);
 		return;
 	}
 #ifdef CONFIG_KWALLETIF
 	KWalletEmu *kwlEmu = doc->init->kwalletEmu();
 	if (kwlEmu)
 		kwlEmu->suspendDocSignals();
 #endif // CONFIG_KWALLETIF
 	/* We simply trigger all views to update their
 	 * displayed values. This way they have a chance
 	 * to get notified when some meta changes over time.
 	 * (for example an entry expired).
 	 * The _view_ is responsive for not updating its
 	 * contents if nothing really changed!
 	 */
 	emit doc->dataChanged(doc);
 #ifdef CONFIG_KWALLETIF
 	if (kwlEmu)
 		kwlEmu->resumeDocSignals();
 #endif // CONFIG_KWALLETIF
 	metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true);
 }
 
 
 
 PwMDocList PwMDoc::openDocList;
 unsigned int PwMDocList::unnamedDocCnt = 1;
 
 PwMDoc::PwMDoc(QObject *parent, const char *name)
  : PwMDocUi(parent, name)
  , dataChangedLock (0)
 {
 	deleted = false;
 	unnamedNum = 0;
 	getOpenDocList()->add(this, getTitle().latin1());
 	curDocStat = 0;
 	setMaxNumEntries();
 	_timer = new DocTimer(this);
 	timer()->start(DocTimer::id_mpwTimer);
 	timer()->start(DocTimer::id_autoLockTimer);
 	timer()->start(DocTimer::id_metaCheckTimer);
 	addCategory(DEFAULT_CATEGORY, 0, false);
 	listView = 0;
 	emit docCreated(this);
 }
 
 PwMDoc::~PwMDoc()
 {
 	emit docClosed(this);
 	getOpenDocList()->del(this);
 	delete _timer;
 }
 
 PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 {
 	PwMerror ret, e;
 	string serialized;
 	QFile f;
 	QString tmpFileMoved(QString::null);
 	bool wasDeepLocked;
 	QString savedFilename(filename);
 
 	if (!file) {
 		if (filename == "")
 			return e_filename;
 		if (isDeepLocked()) {
 		  /* We don't need to save any data.
 		   * It's already all on disk, because
 		   * we are deeplocked.
 		   */
 		  unsetDocStatFlag(DOC_STAT_DISK_DIRTY);
 		  ret = e_success;
-		  goto out;
+          return ret;
 		}
  	} else {
 		if (*file == "" && filename == "")
 			return e_filename;
 		if (*file != "")
 			filename = *file;
 	}
 
 	wasDeepLocked = isDeepLocked();
 	if (wasDeepLocked) {
 	  /* We are deeplocked. That means all data is already
 	   * on disk. BUT we need to do saving procedure,
 	   * because *file != savedFilename.
 	   * Additionally we need to tempoarly restore
 	   * the old "filename", because deepLock() references it.
 	   */
 	  QString newFilename(filename);
 	  filename = savedFilename;
 	  getDataChangedLock();
 	  e = deepLock(false);
 	  putDataChangedLock();
 	  filename = newFilename;
 	  switch (e) {
 	     case e_success:
 	       break;
 	     case e_wrongPw:
 	     case e_noPw:
 	       emitDataChanged(this);
 	       return e;
 	     default:
 	       emitDataChanged(this);
 	       return e_openFile;
 	  }
 	}
 
 	if (!isPwAvailable()) {
 		/* password is not available. This means, the
 		 * document wasn't saved, yet.
 		 */
 		bool useChipcard = getDocStatFlag(DOC_STAT_USE_CHIPCARD);
 		QString pw(requestNewMpw(&useChipcard));
 		if (pw != "") {
 			currentPw = pw;
 		} else {
 			return e_noPw;
 		}
 		if (useChipcard) {
 			setDocStatFlag(DOC_STAT_USE_CHIPCARD);
 		} else {
 			unsetDocStatFlag(DOC_STAT_USE_CHIPCARD);
 		}
 	}
 
 	int _cryptAlgo = conf()->confGlobCryptAlgo();
 	int _hashAlgo = conf()->confGlobHashAlgo();
 
 	// sanity check for the selected algorithms
 	if (_cryptAlgo < PWM_CRYPT_BLOWFISH ||
 	    _cryptAlgo > PWM_CRYPT_TWOFISH128) {
 		printWarn("Invalid Crypto-Algorithm selected! "
 			  "Config-file seems to be corrupt. "
 			  "Falling back to Blowfish.");
 		_cryptAlgo = PWM_CRYPT_BLOWFISH;
 	}
 	if (_hashAlgo < PWM_HASH_SHA1 ||
 	    _hashAlgo > PWM_HASH_TIGER) {
 		printWarn("Invalid Hash-Algorithm selected! "
 			  "Config-file seems to be corrupt. "
 			  "Falling back to SHA1.");
 		_hashAlgo = PWM_HASH_SHA1;
 	}
 	char cryptAlgo = static_cast<char>(_cryptAlgo);
 	char hashAlgo = static_cast<char>(_hashAlgo);
 
 	if (conf()->confGlobMakeFileBackup()) {
 		if (!backupFile(filename))
 			return e_fileBackup;
 	}
 	if (QFile::exists(filename)) {
 		/* Move the existing file to some tmp file.
 		 * When saving file succeeds, delete tmp file. Otherwise
 		 * move tmp file back. See below.
 		 */
 		Randomizer *rnd = Randomizer::obj();
 		char rnd_buf[5];
 		sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF,
 			rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
 		tmpFileMoved = filename + "." + rnd_buf + ".mv";
 		if (!copyFile(filename, tmpFileMoved))
 			return e_openFile;
 		if (!QFile::remove(filename)) {
 			printWarn(string("removing orig file ")
 				  + filename.latin1()
 				  + " failed!");
 		}
 	}
 	f.setName(filename);
 	if (!f.open(IO_ReadWrite)) {
 		ret = e_openFile;
 		goto out_moveback;
 	}
 	e = writeFileHeader(hashAlgo, hashAlgo,
 			    cryptAlgo, compress,
 			    &currentPw, &f);
 	if (e == e_hashNotImpl) {
 		printDebug("PwMDoc::saveDoc(): writeFileHeader() failed: e_hashNotImpl");
 		f.close();
 		ret = e_hashNotImpl;
 		goto out_moveback;
 	} else if (e != e_success) {
 		printDebug("PwMDoc::saveDoc(): writeFileHeader() failed");
 		f.close();
 		ret = e_writeHeader;
 		goto out_moveback;
 	}
 	if (!serializeDta(&serialized)) {
 		printDebug("PwMDoc::saveDoc(): serializeDta() failed");
 		f.close();
 		ret = e_serializeDta;
 		goto out_moveback;
 	}
 	e = writeDataHash(hashAlgo, &serialized, &f);
 	if (e == e_hashNotImpl) {
 		printDebug("PwMDoc::saveDoc(): writeDataHash() failed: e_hashNotImpl");
 		f.close();
 		ret = e_hashNotImpl;
 		goto out_moveback;
 	} else if (e != e_success) {
 		printDebug("PwMDoc::saveDoc(): writeDataHash() failed");
 		f.close();
 		ret = e_writeHeader;
 		goto out_moveback;
 	}
 	if (!compressDta(&serialized, compress)) {
 		printDebug("PwMDoc::saveDoc(): compressDta() failed");
 		f.close();
 		ret = e_enc;
 		goto out_moveback;
 	}
 	e = encrypt(&serialized, &currentPw, &f, cryptAlgo);
 	if (e == e_weakPw) {
 		printDebug("PwMDoc::saveDoc(): encrypt() failed: e_weakPw");
 		f.close();
 		ret = e_weakPw;
 		goto out_moveback;
 	} else if (e == e_cryptNotImpl) {
 		printDebug("PwMDoc::saveDoc(): encrypt() failed: e_cryptNotImpl");
 		f.close();
 		ret = e_cryptNotImpl;
 		goto out_moveback;
 	} else if (e != e_success) {
 		printDebug("PwMDoc::saveDoc(): encrypt() failed");
 		f.close();
 		ret = e_enc;
 		goto out_moveback;
 	}
 	unsetDocStatFlag(DOC_STAT_DISK_DIRTY);
 	f.close();
 	if (chmod(filename.latin1(),
 		  conf()->confGlobFilePermissions())) {
 		printWarn(string("chmod failed: ") + strerror(errno));
 	}
 	openDocList.edit(this, getTitle().latin1());
 	if (wasDeepLocked) {
 	  /* Do _not_ save the data with the deepLock()
 	   * call, because this will recurse
 	   * into saveDoc()
 	   */
 	  deepLock(true, false);
 	  /* We don't check return value here, because
 	   * it won't fail. See NOTE in deepLock()
 	   */
 	}	
 	if (tmpFileMoved != QString::null) {
 		// now remove the moved file.
 		if (!QFile::remove(tmpFileMoved)) {
 			printWarn(string("removing file ")
 				  + tmpFileMoved.latin1()
 				  + " failed!");
 		}
 	}
 	ret = e_success;
 	printDebug(string("writing file { name: ")
 		   + filename.latin1() + "   compress: "
 		   + tostr(static_cast<int>(compress)) + "   cryptAlgo: "
 		   + tostr(static_cast<int>(cryptAlgo)) + "   hashAlgo: "
 		   + tostr(static_cast<int>(hashAlgo))
 		   + " }");
 	goto out;
 out_moveback:
 	if (tmpFileMoved != QString::null) {
 		if (copyFile(tmpFileMoved, filename)) {