From 5a3f6d5e0046e2e4995b5abaff6383d423c1fc0e Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 5 Mar 2012 21:42:48 +0000 Subject: show password dialog in middle of app window git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@843 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 52d493d..3762e58 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -485,9 +485,9 @@ gpgme_error_t GpgContext::passphrase(const char *uid_hint, } if (mPasswordCache.isEmpty()) { - QString password = QInputDialog::getText(0, tr("Enter Password"), + QString password = QInputDialog::getText(QApplication::activeWindow(), tr("Enter Password"), passwordDialogMessage, QLineEdit::Password, - "", &result, Qt::Window); + "", &result); if (result) mPasswordCache = password.toAscii(); } else { -- cgit From 58bb02114f47976f5a716af9ee00207b112a4bd9 Mon Sep 17 00:00:00 2001 From: nils Date: Wed, 7 Mar 2012 21:00:53 +0000 Subject: set maximum keysize of elgamal subkey to 65536 git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@850 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 1 - keygendialog.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 3762e58..3b21514 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -769,7 +769,6 @@ GpgKey GpgContext::getKeyByFpr(QString fpr) { return GpgKey(); } - /** * note: privkey status is not returned */ diff --git a/keygendialog.cpp b/keygendialog.cpp index 778f24c..daddca8 100644 --- a/keygendialog.cpp +++ b/keygendialog.cpp @@ -41,7 +41,7 @@ void KeyGenDialog::generateKeyDialog() commentEdit = new QLineEdit(this); keySizeSpinBox = new QSpinBox(this); - keySizeSpinBox->setRange(768, 8192); + keySizeSpinBox->setRange(768, 65536); keySizeSpinBox->setValue(2048); keySizeSpinBox->setSingleStep(256); -- cgit From 2344929c3914aabf9c7bc2e05fcb290412871c9a Mon Sep 17 00:00:00 2001 From: nils Date: Wed, 7 Mar 2012 21:25:52 +0000 Subject: added missing tr in password dialog git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@851 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- TODO | 1 + gpgcontext.cpp | 2 +- release/ts/gpg4usb_de.ts | 5 +++++ release/ts/gpg4usb_en.ts | 5 +++++ release/ts/gpg4usb_es.ts | 4 ++++ release/ts/gpg4usb_my.ts | 5 +++++ release/ts/gpg4usb_pt_BR.ts | 5 +++++ release/ts/gpg4usb_ru.ts | 5 +++++ release/ts/gpg4usb_vi.ts | 5 +++++ 9 files changed, 36 insertions(+), 1 deletion(-) (limited to 'gpgcontext.cpp') diff --git a/TODO b/TODO index 5b1b722..94569d4 100644 --- a/TODO +++ b/TODO @@ -54,6 +54,7 @@ Release 0.3.2 - replace qDebug messages with tr() by messagebox (?) - disable tab related actions when no tab is shown [DONE] - credits for key image [DONE] +- on key generation set maximum keysize to 65536 bits for elgamal subkey [DONE] - finally remove obsolete strings from translations BUGS: diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 3b21514..7aaf35b 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -481,7 +481,7 @@ gpgme_error_t GpgContext::passphrase(const char *uid_hint, if (!gpgHint.isEmpty()) { // remove UID, leave only username & email gpgHint.remove(0, gpgHint.indexOf(" ")); - passwordDialogMessage += "Enter Password for
\n" + gpgHint + "\n"; + passwordDialogMessage += ""+tr("Enter Password for")+"
" + gpgHint + "
"; } if (mPasswordCache.isEmpty()) { diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index a78d365..f873026 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -413,6 +413,11 @@ Wrong password Falsches Passwort + + + Enter Password for + + Enter Password diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index 9c16191..c56be76 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -329,6 +329,11 @@ Wrong password + + + Enter Password for + + Enter Password diff --git a/release/ts/gpg4usb_es.ts b/release/ts/gpg4usb_es.ts index 77d9211..0876adc 100644 --- a/release/ts/gpg4usb_es.ts +++ b/release/ts/gpg4usb_es.ts @@ -1440,6 +1440,10 @@ Para acelerar el proceso use su computadora Error signing: Error al firmar: + + Enter Password for + + GpgWin diff --git a/release/ts/gpg4usb_my.ts b/release/ts/gpg4usb_my.ts index e52cce2..1f29646 100644 --- a/release/ts/gpg4usb_my.ts +++ b/release/ts/gpg4usb_my.ts @@ -388,6 +388,11 @@ Wrong password စကားဝှက် မှားနေတယ် + + + Enter Password for + + Enter Password diff --git a/release/ts/gpg4usb_pt_BR.ts b/release/ts/gpg4usb_pt_BR.ts index ed314fc..a8d12d1 100644 --- a/release/ts/gpg4usb_pt_BR.ts +++ b/release/ts/gpg4usb_pt_BR.ts @@ -398,6 +398,11 @@ Wrong password Senha errada + + + Enter Password for + + Enter Password diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts index 5024e5d..59c74e5 100644 --- a/release/ts/gpg4usb_ru.ts +++ b/release/ts/gpg4usb_ru.ts @@ -394,6 +394,11 @@ Wrong password Неверный Пароль + + + Enter Password for + + Enter Password diff --git a/release/ts/gpg4usb_vi.ts b/release/ts/gpg4usb_vi.ts index b89f3b5..ba8a72a 100644 --- a/release/ts/gpg4usb_vi.ts +++ b/release/ts/gpg4usb_vi.ts @@ -381,6 +381,11 @@ Wrong password Mật khẩu không chính xác + + + Enter Password for + + Enter Password -- cgit From a71a1b189f00eda87aaf3d4c19936e377b5061dd Mon Sep 17 00:00:00 2001 From: ubbo Date: Sat, 31 Mar 2012 16:57:01 +0000 Subject: fix some issues with utf8 strings in keys git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@871 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 4 ++-- keydetailsdialog.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 7aaf35b..4ee6cdd 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -254,8 +254,8 @@ GpgKeyList GpgContext::listKeys() gpgkey.revoked = (key->revoked != 0); if (key->uids) { - gpgkey.name = key->uids->name; - gpgkey.email = key->uids->email; + gpgkey.name = QString::fromUtf8(key->uids->name); + gpgkey.email = QString::fromUtf8(key->uids->email); } keys.append(gpgkey); gpgme_key_unref(key); diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp index aeaa69c..dd0723f 100644 --- a/keydetailsdialog.cpp +++ b/keydetailsdialog.cpp @@ -34,12 +34,12 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext* ctx, gpgme_key_t key, QWid buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); - nameVarLabel = new QLabel(key->uids->name); + nameVarLabel = new QLabel(QString::fromUtf8(key->uids->name)); nameVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); - emailVarLabel = new QLabel(key->uids->email); + emailVarLabel = new QLabel(QString::fromUtf8(key->uids->email)); emailVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); - commentVarLabel = new QLabel(key->uids->comment); + commentVarLabel = new QLabel(QString::fromUtf8(key->uids->comment)); commentVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); keyidVarLabel = new QLabel(key->subkeys->keyid); keyidVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); -- cgit From b461e668f89ac12737ac65a31f6ac6068a6c7449 Mon Sep 17 00:00:00 2001 From: ubbo Date: Sat, 31 Mar 2012 16:57:04 +0000 Subject: fix some issues with utf8 strings in keys git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@872 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 4ee6cdd..bc4e1ef 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -465,7 +465,7 @@ gpgme_error_t GpgContext::passphrase(const char *uid_hint, { gpgme_error_t returnValue = GPG_ERR_CANCELED; QString passwordDialogMessage; - QString gpgHint = uid_hint; + QString gpgHint = QString::fromUtf8(uid_hint); bool result; #ifdef _WIN32 DWORD written; -- cgit From 715221276b46d27db69efdcc414b76e277e26428 Mon Sep 17 00:00:00 2001 From: ubbo Date: Mon, 2 Apr 2012 21:09:10 +0000 Subject: also drop pwcache after signing if confset git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@878 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index bc4e1ef..2eef101 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -705,6 +705,10 @@ bool GpgContext::sign(QStringList *uidList, const QByteArray &inBuffer, QByteArr gpgme_data_release(in); gpgme_data_release(out); + if (! settings.value("general/rememberPassword").toBool()) { + clearPasswordCache(); + } + return (err == GPG_ERR_NO_ERROR); } -- cgit From 28ee39f0b991d28d5357cf4a7949e8a42bbf3f08 Mon Sep 17 00:00:00 2001 From: nils Date: Fri, 3 Jan 2014 18:41:12 +0000 Subject: BUGFIX: export of private key in non-ascii path fixed git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-1@1076 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgcontext.cpp | 17 ++++++++++------- gpgcontext.h | 3 ++- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'gpgcontext.cpp') diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 2eef101..d459f37 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -67,11 +67,11 @@ GpgContext::GpgContext() * also lin/win must be checked, for calling gpg.exe if needed */ #ifdef _WIN32 - QString gpgBin = appPath + "/bin/gpg.exe"; + gpgBin = appPath + "/bin/gpg.exe"; #else - QString gpgBin = appPath + "/bin/gpg"; + gpgBin = appPath + "/bin/gpg"; #endif - QString gpgKeys = appPath + "/keydb"; + gpgKeys = appPath + "/keydb"; /* err = gpgme_ctx_set_engine_info(mCtx, GPGME_PROTOCOL_OpenPGP, gpgBin.toUtf8().constData(), gpgKeys.toUtf8().constData());*/ @@ -559,6 +559,7 @@ QString GpgContext::gpgErrString(gpgme_error_t err) { void GpgContext::exportSecretKey(QString uid, QByteArray *outBuffer) { + qDebug() << *outBuffer; // export private key to outBuffer QStringList arguments; arguments << "--armor" << "--export-secret-key" << uid; @@ -576,17 +577,19 @@ void GpgContext::exportSecretKey(QString uid, QByteArray *outBuffer) /** return type should be gpgme_error_t*/ void GpgContext::executeGpgCommand(QStringList arguments, QByteArray *stdOut, QByteArray *stdErr) { - gpgme_engine_info_t engine = gpgme_ctx_get_engine_info(mCtx); - QStringList args; - args << "--homedir" << engine->home_dir << "--batch" << arguments; + args << "--homedir" << gpgKeys << "--batch" << arguments; + qDebug() << args; QProcess gpg; - gpg.start(engine->file_name, args); + // qDebug() << "engine->file_name" << engine->file_name; + + gpg.start(gpgBin, args); gpg.waitForFinished(); *stdOut = gpg.readAllStandardOutput(); *stdErr = gpg.readAllStandardError(); + qDebug() << *stdOut; } /*** diff --git a/gpgcontext.h b/gpgcontext.h index 4efc3fe..5d739a0 100644 --- a/gpgcontext.h +++ b/gpgcontext.h @@ -175,7 +175,8 @@ private: void executeGpgCommand(QStringList arguments, QByteArray *stdOut, QByteArray *stdErr); - + QString gpgBin; + QString gpgKeys; }; } // namespace GpgME -- cgit