summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <kde@opensource.sf-tec.de>2012-04-03 18:54:45 (GMT)
committerRolf Eike Beer <kde@opensource.sf-tec.de>2012-04-03 18:54:45 (GMT)
commit654048def1ca9d89d31076e4d19ae0ed6d1d06f0 (patch)
tree3379ad3013b200f83bf826bc18c97b3927152aea
parent7cc051552f7b698f59a5d2678452e33c575fc699 (diff)
fix generation of DSA/ElGamal keys with GnuPG 1.x
The name "ELG" for ElGamal keys only works with 2.x. Use ELG-E which works with both 1.4 and 2.0.18. It will not work with 2.0.0, but given that it's only that single version and it is more than 5 years old I don't care. BUG:253408 FIXED-IN:4.8.3
-rw-r--r--transactions/kgpggeneratekey.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/transactions/kgpggeneratekey.cpp b/transactions/kgpggeneratekey.cpp
index c2996a6..0033103 100644
--- a/transactions/kgpggeneratekey.cpp
+++ b/transactions/kgpggeneratekey.cpp
@@ -13,12 +13,13 @@
#include "kgpggeneratekey.h"
+#include <gpgproc.h>
+#include <kgpginterface.h>
+
#include <KMessageBox>
#include <KLocale>
-#include <QApplication>
-
#include <kpimutils/email.h>
-#include <gpgproc.h>
+#include <QApplication>
KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const QString &email, const QString &comment,
const KgpgCore::KgpgKeyAlgo &algorithm, const uint size, const unsigned int expire,
@@ -75,7 +76,7 @@ KGpgGenerateKey::postStart()
keymessage.append("RSA\nSubkey-Type: RSA");
break;
case KgpgCore::ALGO_DSA_ELGAMAL:
- keymessage.append("DSA\nSubkey-Type: ELG");
+ keymessage.append("DSA\nSubkey-Type: ELG-E");
break;
default:
Q_ASSERT(m_algorithm == KgpgCore::ALGO_RSA);